Merge pull request #2333 from tseaver/2318-bigquery-dataset-still-in-use

Retry 400s during dataset teardown.

Author: tseaver

system_tests/bigquery.py

@@ -17,7 +17,6 @@
 import unittest
 
 from google.cloud import bigquery
-from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import Forbidden
 
 from retry import RetryErrors
@@ -35,6 +34,7 @@ def _rate_limit_exceeded(forbidden):
     return any(error['reason'] == 'rateLimitExceeded'
                for error in forbidden._errors)
 
+
 # We need to wait to stay within the rate limits.
 # The alternative outcome is a 403 Forbidden response from upstream, which
 # they return instead of the more appropriate 429.
@@ -61,11 +61,22 @@ def setUp(self):
         self.to_delete = []
 
     def tearDown(self):
+        from google.cloud.bigquery.dataset import Dataset
         from google.cloud.storage import Bucket
+        from google.cloud.exceptions import BadRequest
+        from google.cloud.exceptions import Conflict
+
+        def _still_in_use(bad_request):
+            return any(error['reason'] == 'resourceInUse'
+                       for error in bad_request._errors)
+
+        retry_in_use = RetryErrors(BadRequest, error_predicate=_still_in_use)
+        retry_409 = RetryErrors(Conflict)
         for doomed in self.to_delete:
             if isinstance(doomed, Bucket):
-                retry = RetryErrors(Conflict)
-                retry(doomed.delete)(force=True)
+                retry_409(doomed.delete)(force=True)
+            elif isinstance(doomed, Dataset):
+                retry_in_use(doomed.delete)()
             else:
                 doomed.delete()