Merge pull request #2310 from dhermes/bigquery-409-bucket-delete

dhermes · web-flow · commit 1f7ed9d35ef5 · 2016-09-14T17:09:55.000-07:00
Adding 409 retry on bucket delete in BigQuery system test.
diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py
@@ -17,6 +17,7 @@
 import unittest
 
 from google.cloud import bigquery
+from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import Forbidden
 
 from retry import RetryErrors
@@ -59,8 +60,13 @@ def setUp(self):
         self.to_delete = []
 
     def tearDown(self):
+        from google.cloud.storage import Bucket
         for doomed in self.to_delete:
-            doomed.delete()
+            if isinstance(doomed, Bucket):
+                retry = RetryErrors(Conflict)
+                retry(doomed.delete)(force=True)
+            else:
+                doomed.delete()
 
     def test_create_dataset(self):
         dataset = Config.CLIENT.dataset(DATASET_NAME)
