Merge pull request #192 from tseaver/138-save_acl-clear_existing_loca…

…l_acl Fix #138: clear existing (local) ACL when saving ACL to server.
googleapis · Sep 30, 2014 · 23fc80f · 23fc80f
2 parents 60887ab + fb756b2
commit 23fc80f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gcloud/storage/bucket.py b/gcloud/storage/bucket.py
@@ -492,7 +492,9 @@ def save_acl(self, acl=None):
     if acl is None:
       return self
 
-    return self.patch_metadata({'acl': list(acl)})
+    self.patch_metadata({'acl': list(acl)})
+    self.reload_acl()
+    return self
 
   def clear_acl(self):
     """Remove all ACL rules from the bucket.

diff --git a/gcloud/storage/key.py b/gcloud/storage/key.py
@@ -404,7 +404,9 @@ def save_acl(self, acl=None):
     if acl is None:
       return self
 
-    return self.patch_metadata({'acl': list(acl)})
+    self.patch_metadata({'acl': list(acl)})
+    self.reload_acl()
+    return self
 
   def clear_acl(self):
     """Remove all ACL rules from the key.

diff --git a/gcloud/storage/test_bucket.py b/gcloud/storage/test_bucket.py
@@ -583,8 +583,7 @@ def test_save_acl_existing_set_new_passed(self):
         bucket = self._makeOne(connection, NAME, metadata)
         bucket.reload_acl()
         self.assertTrue(bucket.save_acl(new_acl) is bucket)
-        # See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
-        #self.assertEqual(list(bucket.acl), new_acl)
+        self.assertEqual(list(bucket.acl), new_acl)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')
@@ -601,8 +600,7 @@ def test_clear_acl(self):
         bucket = self._makeOne(connection, NAME, metadata)
         bucket.reload_acl()
         self.assertTrue(bucket.clear_acl() is bucket)
-        # See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
-        #self.assertEqual(list(bucket.acl), [])
+        self.assertEqual(list(bucket.acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')

diff --git a/gcloud/storage/test_key.py b/gcloud/storage/test_key.py
@@ -509,8 +509,7 @@ def test_save_acl_existing_set_new_passed(self):
         key = self._makeOne(bucket, KEY, metadata)
         key.reload_acl()
         self.assertTrue(key.save_acl(new_acl) is key)
-        # See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
-        #self.assertEqual(list(bucket.acl), new_acl)
+        self.assertEqual(list(key.acl), new_acl)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')
@@ -528,8 +527,7 @@ def test_clear_acl(self):
         key = self._makeOne(bucket, KEY, metadata)
         key.reload_acl()
         self.assertTrue(key.clear_acl() is key)
-        # See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
-        #self.assertEqual(list(key.acl), [])
+        self.assertEqual(list(key.acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')