Merge pull request #2380 from tseaver/2315-retry_instance_state-retry…

…_result-raise Raise exception if retry-backoff fails to pass predicate.
googleapis · Sep 21, 2016 · 0c4fca3 · 0c4fca3
2 parents 1f223f2 + 000dea6
commit 0c4fca3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py
@@ -356,7 +356,6 @@ def _job_done(instance):
         retry = RetryInstanceState(_job_done, max_tries=8)
         retry(job.reload)()
 
-        self.assertTrue(_job_done(job))
         self.assertEqual(job.output_rows, len(ROWS))
 
         rows, _, _ = table.fetch_data()
@@ -429,8 +428,6 @@ def _job_done(instance):
         retry = RetryInstanceState(_job_done, max_tries=8)
         retry(job.reload)()
 
-        self.assertTrue(job.state in ('DONE', 'done'))
-
         rows, _, _ = table.fetch_data()
         by_age = operator.itemgetter(1)
         self.assertEqual(sorted(rows, key=by_age),

diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py
@@ -221,8 +221,6 @@ def test_topic_iam_policy(self):
         # Retry / backoff up to 7 seconds (1 + 2 + 4)
         retry = RetryResult(lambda result: result, max_tries=4)
         retry(topic.exists)()
-
-        self.assertTrue(topic.exists())
         self.to_delete.append(topic)
 
         if topic.check_iam_permissions([PUBSUB_TOPICS_GET_IAM_POLICY]):
@@ -241,18 +239,15 @@ def test_subscription_iam_policy(self):
         # Retry / backoff up to 7 seconds (1 + 2 + 4)
         retry = RetryResult(lambda result: result, max_tries=4)
         retry(topic.exists)()
-
-        self.assertTrue(topic.exists())
         self.to_delete.append(topic)
+
         SUB_NAME = 'test-sub-iam-policy-sub' + unique_resource_id('-')
         subscription = topic.subscription(SUB_NAME)
         subscription.create()
 
         # Retry / backoff up to 7 seconds (1 + 2 + 4)
         retry = RetryResult(lambda result: result, max_tries=4)
         retry(subscription.exists)()
-
-        self.assertTrue(subscription.exists())
         self.to_delete.insert(0, subscription)
 
         if subscription.check_iam_permissions(

diff --git a/system_tests/retry.py b/system_tests/retry.py
@@ -13,6 +13,10 @@ def _retry_all(_):
     return True
 
 
+class BackoffFailed(Exception):
+    """Retry w/ backoffs did not complete successfully."""
+
+
 class RetryBase(object):
     """Base for retrying calling a decorated function w/ exponential backoff.
 
@@ -134,7 +138,7 @@ def wrapped_function(*args, **kwargs):
 
                 time.sleep(delay)
                 tries += 1
-            return to_wrap(*args, **kwargs)
+            raise BackoffFailed()
 
         return wrapped_function
 
@@ -184,6 +188,6 @@ def wrapped_function(*args, **kwargs):
 
                 time.sleep(delay)
                 tries += 1
-            return to_wrap(*args, **kwargs)
+            raise BackoffFailed()
 
         return wrapped_function