diff --git a/gcloud/storage/bucket.py b/gcloud/storage/bucket.py index c9ad272f4212..71468e80ac27 100644 --- a/gcloud/storage/bucket.py +++ b/gcloud/storage/bucket.py @@ -541,7 +541,6 @@ def get_logging(self): :returns: a dict w/ keys, ``logBucket`` and ``logObjectPrefix`` (if logging is enabled), or None (if not). """ - self.reload() info = self._properties.get('logging') if info is not None: return info.copy() @@ -559,7 +558,6 @@ def enable_logging(self, bucket_name, object_prefix=''): """ info = {'logBucket': bucket_name, 'logObjectPrefix': object_prefix} self._patch_properties({'logging': info}) - self.patch() def disable_logging(self): """Disable access logging for this bucket. @@ -567,7 +565,6 @@ def disable_logging(self): See: https://cloud.google.com/storage/docs/accesslogs#disabling """ self._patch_properties({'logging': None}) - self.patch() @property def metageneration(self): diff --git a/gcloud/storage/test_bucket.py b/gcloud/storage/test_bucket.py index d4e254558153..9a9ea2ed3979 100644 --- a/gcloud/storage/test_bucket.py +++ b/gcloud/storage/test_bucket.py @@ -687,6 +687,7 @@ def test_get_logging_w_prefix(self): resp_to_reload = before connection = _Connection(resp_to_reload) bucket = self._makeOne(NAME, connection) + bucket.reload() info = bucket.get_logging() self.assertEqual(info['logBucket'], LOG_BUCKET) self.assertEqual(info['logObjectPrefix'], LOG_PREFIX) @@ -707,13 +708,15 @@ def test_enable_logging_defaults(self): connection = _Connection(resp_to_reload, resp_to_enable_logging, resp_to_enable_logging) bucket = self._makeOne(NAME, connection, properties=before) + bucket.reload() self.assertTrue(bucket.get_logging() is None) bucket.enable_logging(LOG_BUCKET) info = bucket.get_logging() + bucket.patch() self.assertEqual(info['logBucket'], LOG_BUCKET) self.assertEqual(info['logObjectPrefix'], '') kw = connection._requested - self.assertEqual(len(kw), 3) + self.assertEqual(len(kw), 2) self.assertEqual(kw[0]['method'], 'GET') self.assertEqual(kw[0]['path'], '/b/%s' % NAME) self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'}) @@ -721,9 +724,6 @@ def test_enable_logging_defaults(self): self.assertEqual(kw[1]['path'], '/b/%s' % NAME) self.assertEqual(kw[1]['data'], resp_to_enable_logging) self.assertEqual(kw[1]['query_params'], {'projection': 'full'}) - self.assertEqual(kw[2]['method'], 'GET') - self.assertEqual(kw[2]['path'], '/b/%s' % NAME) - self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'}) def test_enable_logging_explicit(self): NAME = 'name' @@ -738,13 +738,15 @@ def test_enable_logging_explicit(self): resp_to_enable_logging, resp_to_enable_logging) bucket = self._makeOne(NAME, connection, properties=before) + bucket.reload() self.assertTrue(bucket.get_logging() is None) bucket.enable_logging(LOG_BUCKET, LOG_PFX) + bucket.patch() info = bucket.get_logging() self.assertEqual(info['logBucket'], LOG_BUCKET) self.assertEqual(info['logObjectPrefix'], LOG_PFX) kw = connection._requested - self.assertEqual(len(kw), 3) + self.assertEqual(len(kw), 2) self.assertEqual(kw[0]['method'], 'GET') self.assertEqual(kw[0]['path'], '/b/%s' % NAME) self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'}) @@ -752,9 +754,6 @@ def test_enable_logging_explicit(self): self.assertEqual(kw[1]['path'], '/b/%s' % NAME) self.assertEqual(kw[1]['data'], resp_to_enable_logging) self.assertEqual(kw[1]['query_params'], {'projection': 'full'}) - self.assertEqual(kw[2]['method'], 'GET') - self.assertEqual(kw[2]['path'], '/b/%s' % NAME) - self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'}) def test_disable_logging(self): NAME = 'name' @@ -764,11 +763,13 @@ def test_disable_logging(self): connection = _Connection(resp_to_reload, resp_to_disable_logging, resp_to_disable_logging) bucket = self._makeOne(NAME, connection, properties=before) + bucket.reload() self.assertTrue(bucket.get_logging() is not None) bucket.disable_logging() + bucket.patch() self.assertTrue(bucket.get_logging() is None) kw = connection._requested - self.assertEqual(len(kw), 3) + self.assertEqual(len(kw), 2) self.assertEqual(kw[0]['method'], 'GET') self.assertEqual(kw[0]['path'], '/b/%s' % NAME) self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'}) @@ -776,9 +777,6 @@ def test_disable_logging(self): self.assertEqual(kw[1]['path'], '/b/%s' % NAME) self.assertEqual(kw[1]['data'], {'logging': None}) self.assertEqual(kw[1]['query_params'], {'projection': 'full'}) - self.assertEqual(kw[2]['method'], 'GET') - self.assertEqual(kw[2]['path'], '/b/%s' % NAME) - self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'}) def test_metageneration(self): METAGENERATION = 42