Change comments, Retry class properties.

googleapis · Aug 2, 2016 · e06815d · e06815d
1 parent f33b2ea
commit e06815d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py
@@ -93,9 +93,9 @@ def test_update_dataset(self):
                  if grant.entity_id != 'projectWriters']
         dataset.access_grants = after
 
-        # We need to wait for the changes in the dataset to propgate and be
-        # eventually consistent. The alternative outcome is a 403 Forbidden
-        # response from upstream due to upstream rate limiting.
+        # We need to wait to stay within the rate limits.
+        # The alternative outcome is a 403 Forbidden response from upstream.
+        # See: https://cloud.google.com/bigquery/quota-policy
         @Retry(Forbidden, tries=2, delay=30)
         def update_dataset():
             dataset.update()
@@ -199,9 +199,9 @@ def test_update_table(self):
         dataset = Config.CLIENT.dataset(DATASET_NAME)
         self.assertFalse(dataset.exists())
 
-        # We need to wait for the changes in the dataset to propgate and be
-        # eventually consistent. The alternative outcome is a 403 Forbidden
-        # response from upstream due to upstream rate limiting.
+        # We need to wait to stay within the rate limits.
+        # The alternative outcome is a 403 Forbidden response from upstream.
+        # See: https://cloud.google.com/bigquery/quota-policy
         @Retry(Forbidden, tries=2, delay=30)
         def create_dataset():
             dataset.create()

diff --git a/system_tests/retry.py b/system_tests/retry.py
@@ -38,20 +38,18 @@ def __call__(self, to_wrap):
         @wraps(to_wrap)
         def wrapped_function(*args, **kwargs):
             tries_counter = self.tries
-            exception = self.exception
             delay = self.delay
-            backoff = self.backoff
             while tries_counter > 0:
                 try:
                     return to_wrap(*args, **kwargs)
-                except exception as caught_exception:
+                except self.exception as caught_exception:
                     msg = ("%s, Trying again in %d seconds..." %
                            (str(caught_exception), delay))
                     self.logger(msg)
 
                     time.sleep(delay)
                     tries_counter -= 1
-                    delay *= backoff
+                    delay *= self.backoff
             return to_wrap(*args, **kwargs)
 
         return wrapped_function