Merge pull request #740 from dhermes/fix-725-regression-failure

Fixing regression failure introduced in #725.

Author: dhermes

regression/storage.py

@@ -119,7 +119,7 @@ def test_large_file_write_from_stream(self):
 
         file_data = self.FILES['big']
         with open(file_data['path'], 'rb') as file_obj:
-            self.bucket.upload_file_object(file_obj, blob=blob)
+            self.bucket.upload_file_object(file_obj, blob_name=blob.name)
             self.case_blobs_to_delete.append(blob)
 
         blob._reload_properties()  # force a reload
@@ -165,7 +165,7 @@ def test_direct_write_and_read_into_file(self):
 
     def test_copy_existing_file(self):
         blob = self.bucket.upload_file(self.FILES['logo']['path'],
-                                       blob='CloudLogo')
+                                       blob_name='CloudLogo')
         self.case_blobs_to_delete.append(blob)
 
         new_blob = self.bucket.copy_blob(blob, self.bucket, 'CloudLogoCopy')
@@ -190,7 +190,7 @@ def setUpClass(cls):
             blob.delete()
 
         logo_path = cls.FILES['logo']['path']
-        blob = cls.bucket.upload_file(logo_path, blob=cls.FILENAMES[0])
+        blob = cls.bucket.upload_file(logo_path, blob_name=cls.FILENAMES[0])
         cls.suite_blobs_to_delete = [blob]
 
         # Copy main blob onto remaining in FILENAMES.
@@ -241,7 +241,7 @@ def setUpClass(cls):
             blob.delete()
 
         simple_path = cls.FILES['simple']['path']
-        blob = cls.bucket.upload_file(simple_path, blob=cls.FILENAMES[0])
+        blob = cls.bucket.upload_file(simple_path, blob_name=cls.FILENAMES[0])
         cls.suite_blobs_to_delete = [blob]
         for filename in cls.FILENAMES[1:]:
             new_blob = cls.bucket.copy_blob(blob, cls.bucket, filename)
@@ -336,4 +336,4 @@ def test_create_signed_delete_url(self):
         self.assertEqual(content, '')
 
         # Check that the blob has actually been deleted.
-        self.assertFalse(blob in self.bucket)
+        self.assertFalse(blob.name in self.bucket)