Skip to content

Commit 0d43bf3

Browse files
dhermesdhermes
committed
Removing superfluous HTTP requests in tests of local setters/getters.
Fixes #778.
1 parent 6283ab9 commit 0d43bf3

File tree

3 files changed

+62
-225
lines changed

3 files changed

+62
-225
lines changed

‎gcloud/storage/test__helpers.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,9 @@ def test_reload(self):
6262
self.assertEqual(derived._changes, set())
6363

6464
def test__patch_property(self):
65-
connection = _Connection({'foo': 'Foo'})
66-
derived = self._derivedClass(connection, '/path')()
65+
derived = self._derivedClass()()
6766
derived._patch_property('foo', 'Foo')
68-
derived.patch()
69-
kw = connection._requested
70-
self.assertEqual(len(kw), 1)
71-
self.assertEqual(kw[0]['method'], 'PATCH')
72-
self.assertEqual(kw[0]['path'], '/path')
73-
self.assertEqual(kw[0]['data'], {'foo': 'Foo'})
74-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
67+
self.assertEqual(derived._properties, {'foo': 'Foo'})
7568

7669
def test_patch(self):
7770
connection = _Connection({'foo': 'Foo'})

‎gcloud/storage/test_blob.py‎

Lines changed: 24 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -702,19 +702,13 @@ def test_cache_control_getter(self):
702702
def test_cache_control_setter(self):
703703
BLOB_NAME = 'blob-name'
704704
CACHE_CONTROL = 'no-cache'
705-
after = {'cacheControl': CACHE_CONTROL}
706-
connection = _Connection(after)
705+
connection = _Connection()
707706
bucket = _Bucket(connection)
708707
blob = self._makeOne(BLOB_NAME, bucket=bucket)
708+
self.assertEqual(blob.cache_control, None)
709709
blob.cache_control = CACHE_CONTROL
710-
blob.patch()
711710
self.assertEqual(blob.cache_control, CACHE_CONTROL)
712-
kw = connection._requested
713-
self.assertEqual(len(kw), 1)
714-
self.assertEqual(kw[0]['method'], 'PATCH')
715-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
716-
self.assertEqual(kw[0]['data'], {'cacheControl': CACHE_CONTROL})
717-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
711+
self.assertEqual(len(connection._requested), 0)
718712

719713
def test_component_count(self):
720714
BUCKET = object()
@@ -748,20 +742,13 @@ def test_content_disposition_getter(self):
748742
def test_content_disposition_setter(self):
749743
BLOB_NAME = 'blob-name'
750744
CONTENT_DISPOSITION = 'Attachment; filename=example.jpg'
751-
after = {'contentDisposition': CONTENT_DISPOSITION}
752-
connection = _Connection(after)
745+
connection = _Connection()
753746
bucket = _Bucket(connection)
754747
blob = self._makeOne(BLOB_NAME, bucket=bucket)
748+
self.assertEqual(blob.content_disposition, None)
755749
blob.content_disposition = CONTENT_DISPOSITION
756-
blob.patch()
757750
self.assertEqual(blob.content_disposition, CONTENT_DISPOSITION)
758-
kw = connection._requested
759-
self.assertEqual(len(kw), 1)
760-
self.assertEqual(kw[0]['method'], 'PATCH')
761-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
762-
self.assertEqual(kw[0]['data'],
763-
{'contentDisposition': CONTENT_DISPOSITION})
764-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
751+
self.assertEqual(len(connection._requested), 0)
765752

766753
def test_content_encoding_getter(self):
767754
BLOB_NAME = 'blob-name'
@@ -775,20 +762,13 @@ def test_content_encoding_getter(self):
775762
def test_content_encoding_setter(self):
776763
BLOB_NAME = 'blob-name'
777764
CONTENT_ENCODING = 'gzip'
778-
after = {'contentEncoding': CONTENT_ENCODING}
779-
connection = _Connection(after)
765+
connection = _Connection()
780766
bucket = _Bucket(connection)
781767
blob = self._makeOne(BLOB_NAME, bucket=bucket)
768+
self.assertEqual(blob.content_encoding, None)
782769
blob.content_encoding = CONTENT_ENCODING
783-
blob.patch()
784770
self.assertEqual(blob.content_encoding, CONTENT_ENCODING)
785-
kw = connection._requested
786-
self.assertEqual(len(kw), 1)
787-
self.assertEqual(kw[0]['method'], 'PATCH')
788-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
789-
self.assertEqual(kw[0]['data'],
790-
{'contentEncoding': CONTENT_ENCODING})
791-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
771+
self.assertEqual(len(connection._requested), 0)
792772

793773
def test_content_language_getter(self):
794774
BLOB_NAME = 'blob-name'
@@ -802,20 +782,13 @@ def test_content_language_getter(self):
802782
def test_content_language_setter(self):
803783
BLOB_NAME = 'blob-name'
804784
CONTENT_LANGUAGE = 'pt-BR'
805-
after = {'contentLanguage': CONTENT_LANGUAGE}
806-
connection = _Connection(after)
785+
connection = _Connection()
807786
bucket = _Bucket(connection)
808787
blob = self._makeOne(BLOB_NAME, bucket=bucket)
788+
self.assertEqual(blob.content_language, None)
809789
blob.content_language = CONTENT_LANGUAGE
810-
blob.patch()
811790
self.assertEqual(blob.content_language, CONTENT_LANGUAGE)
812-
kw = connection._requested
813-
self.assertEqual(len(kw), 1)
814-
self.assertEqual(kw[0]['method'], 'PATCH')
815-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
816-
self.assertEqual(kw[0]['data'],
817-
{'contentLanguage': CONTENT_LANGUAGE})
818-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
791+
self.assertEqual(len(connection._requested), 0)
819792

820793
def test_content_type_getter(self):
821794
BLOB_NAME = 'blob-name'
@@ -829,20 +802,13 @@ def test_content_type_getter(self):
829802
def test_content_type_setter(self):
830803
BLOB_NAME = 'blob-name'
831804
CONTENT_TYPE = 'image/jpeg'
832-
after = {'contentType': CONTENT_TYPE}
833-
connection = _Connection(after)
805+
connection = _Connection()
834806
bucket = _Bucket(connection)
835807
blob = self._makeOne(BLOB_NAME, bucket=bucket)
808+
self.assertEqual(blob.content_type, None)
836809
blob.content_type = CONTENT_TYPE
837-
blob.patch()
838810
self.assertEqual(blob.content_type, CONTENT_TYPE)
839-
kw = connection._requested
840-
self.assertEqual(len(kw), 1)
841-
self.assertEqual(kw[0]['method'], 'PATCH')
842-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
843-
self.assertEqual(kw[0]['data'],
844-
{'contentType': CONTENT_TYPE})
845-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
811+
self.assertEqual(len(connection._requested), 0)
846812

847813
def test_crc32c_getter(self):
848814
BLOB_NAME = 'blob-name'
@@ -856,20 +822,13 @@ def test_crc32c_getter(self):
856822
def test_crc32c_setter(self):
857823
BLOB_NAME = 'blob-name'
858824
CRC32C = 'DEADBEEF'
859-
after = {'crc32c': CRC32C}
860-
connection = _Connection(after)
825+
connection = _Connection()
861826
bucket = _Bucket(connection)
862827
blob = self._makeOne(BLOB_NAME, bucket=bucket)
828+
self.assertEqual(blob.crc32c, None)
863829
blob.crc32c = CRC32C
864-
blob.patch()
865830
self.assertEqual(blob.crc32c, CRC32C)
866-
kw = connection._requested
867-
self.assertEqual(len(kw), 1)
868-
self.assertEqual(kw[0]['method'], 'PATCH')
869-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
870-
self.assertEqual(kw[0]['data'],
871-
{'crc32c': CRC32C})
872-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
831+
self.assertEqual(len(connection._requested), 0)
873832

874833
def test_etag(self):
875834
BLOB_NAME = 'blob-name'
@@ -920,20 +879,13 @@ def test_md5_hash_getter(self):
920879
def test_md5_hash_setter(self):
921880
BLOB_NAME = 'blob-name'
922881
MD5_HASH = 'DEADBEEF'
923-
after = {'md5Hash': MD5_HASH}
924-
connection = _Connection(after)
882+
connection = _Connection()
925883
bucket = _Bucket(connection)
926884
blob = self._makeOne(BLOB_NAME, bucket=bucket)
885+
self.assertEqual(blob.md5_hash, None)
927886
blob.md5_hash = MD5_HASH
928-
blob.patch()
929887
self.assertEqual(blob.md5_hash, MD5_HASH)
930-
kw = connection._requested
931-
self.assertEqual(len(kw), 1)
932-
self.assertEqual(kw[0]['method'], 'PATCH')
933-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
934-
self.assertEqual(kw[0]['data'],
935-
{'md5Hash': MD5_HASH})
936-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
888+
self.assertEqual(len(connection._requested), 0)
937889

938890
def test_media_link(self):
939891
BLOB_NAME = 'blob-name'
@@ -956,20 +908,13 @@ def test_metadata_getter(self):
956908
def test_metadata_setter(self):
957909
BLOB_NAME = 'blob-name'
958910
METADATA = {'foo': 'Foo'}
959-
after = {'metadata': METADATA}
960-
connection = _Connection(after)
911+
connection = _Connection()
961912
bucket = _Bucket(connection)
962913
blob = self._makeOne(BLOB_NAME, bucket=bucket)
914+
self.assertEqual(blob.metadata, None)
963915
blob.metadata = METADATA
964-
blob.patch()
965916
self.assertEqual(blob.metadata, METADATA)
966-
kw = connection._requested
967-
self.assertEqual(len(kw), 1)
968-
self.assertEqual(kw[0]['method'], 'PATCH')
969-
self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
970-
self.assertEqual(kw[0]['data'],
971-
{'metadata': METADATA})
972-
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
917+
self.assertEqual(len(connection._requested), 0)
973918

974919
def test_metageneration(self):
975920
BUCKET = object()

0 commit comments

Comments
 (0)