Re-raise NotFound error from 'Bucket.delete_keys' if no callback passed.

tseaver · tseaver · commit f14470f8702b · 2014-10-31T21:51:23.000-04:00
diff --git a/gcloud/storage/bucket.py b/gcloud/storage/bucket.py
@@ -198,6 +198,8 @@ def delete_keys(self, keys, on_error=None):
             except exceptions.NotFoundError:
                 if on_error is not None:
                     on_error(key)
+                else:
+                    raise
 
     def copy_key(self, key, destination_bucket, new_name=None):
         """Copy the given key to the given bucket, optionally with a new name.
diff --git a/gcloud/storage/test_bucket.py b/gcloud/storage/test_bucket.py
@@ -232,13 +232,14 @@ def test_delete_keys_hit(self):
         self.assertEqual(kw[0]['method'], 'DELETE')
         self.assertEqual(kw[0]['path'], '/b/%s/o/%s' % (NAME, KEY))
 
-    def test_delete_keys_miss(self):
+    def test_delete_keys_miss_no_on_error(self):
+        from gcloud.storage.exceptions import NotFoundError
         NAME = 'name'
         KEY = 'key'
         NONESUCH = 'nonesuch'
         connection = _Connection({})
         bucket = self._makeOne(connection, NAME)
-        bucket.delete_keys([KEY, NONESUCH])
+        self.assertRaises(NotFoundError, bucket.delete_keys, [KEY, NONESUCH])
         kw = connection._requested
         self.assertEqual(len(kw), 2)
         self.assertEqual(kw[0]['method'], 'DELETE')
