From 04ba2094161000880c09054fc7aad219ebb43c76 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 9 Mar 2015 14:59:16 -0700 Subject: [PATCH] Removing uses of Bucket.new_blob from regression tests. This is towards removing Bucket.new_blob(). It is currently used only in Bucket to coerce from string OR a Blob object and then perform some action on the Blob object: - Bucket.get_blob() - Bucket.delete_blob() - Bucket.upload_file() - Bucket.upload_file_object() But we can move most of this behavior onto Blob (no coercion necessary). --- gcloud/storage/__init__.py | 1 + regression/storage.py | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gcloud/storage/__init__.py b/gcloud/storage/__init__.py index 24305c05795f..9cd182565f5a 100644 --- a/gcloud/storage/__init__.py +++ b/gcloud/storage/__init__.py @@ -41,6 +41,7 @@ from gcloud import credentials from gcloud.storage import _implicit_environ +from gcloud.storage.blob import Blob from gcloud.storage.bucket import Bucket from gcloud.storage.connection import Connection diff --git a/regression/storage.py b/regression/storage.py index 397f11a6da08..7ec1cac749ba 100644 --- a/regression/storage.py +++ b/regression/storage.py @@ -116,7 +116,7 @@ def tearDown(self): class TestStorageWriteFiles(TestStorageFiles): def test_large_file_write_from_stream(self): - blob = self.bucket.new_blob('LargeFile') + blob = storage.Blob(bucket=self.bucket, name='LargeFile') self.assertEqual(blob._properties, {}) file_data = self.FILES['big'] @@ -128,7 +128,7 @@ def test_large_file_write_from_stream(self): self.assertEqual(blob.md5_hash, file_data['hash']) def test_small_file_write_from_filename(self): - blob = self.bucket.new_blob('LargeFile') + blob = storage.Blob(bucket=self.bucket, name='LargeFile') self.assertEqual(blob._properties, {}) file_data = self.FILES['simple'] @@ -149,12 +149,12 @@ def test_write_metadata(self): self.assertEqual(blob.content_type, 'image/png') def test_direct_write_and_read_into_file(self): - blob = self.bucket.new_blob('MyBuffer') + blob = storage.Blob(bucket=self.bucket, name='MyBuffer') file_contents = 'Hello World' blob.upload_from_string(file_contents) self.case_blobs_to_delete.append(blob) - same_blob = self.bucket.new_blob('MyBuffer') + same_blob = storage.Blob(bucket=self.bucket, name='MyBuffer') temp_filename = tempfile.mktemp() with open(temp_filename, 'w') as file_obj: same_blob.download_to_file(file_obj) @@ -306,7 +306,7 @@ def setUp(self): with open(logo_path, 'r') as file_obj: self.LOCAL_FILE = file_obj.read() - blob = self.bucket.new_blob('LogoToSign.jpg') + blob = storage.Blob(bucket=self.bucket, name='LogoToSign.jpg') blob.upload_from_string(self.LOCAL_FILE) self.case_blobs_to_delete.append(blob) @@ -316,7 +316,7 @@ def tearDown(self): blob.delete() def test_create_signed_read_url(self): - blob = self.bucket.new_blob('LogoToSign.jpg') + blob = storage.Blob(bucket=self.bucket, name='LogoToSign.jpg') expiration = int(time.time() + 5) signed_url = blob.generate_signed_url(expiration, method='GET') @@ -325,7 +325,7 @@ def test_create_signed_read_url(self): self.assertEqual(content, self.LOCAL_FILE) def test_create_signed_delete_url(self): - blob = self.bucket.new_blob('LogoToSign.jpg') + blob = storage.Blob(bucket=self.bucket, name='LogoToSign.jpg') expiration = int(time.time() + 283473274) signed_delete_url = blob.generate_signed_url(expiration, method='DELETE')