Scoping the settings.

Author: daspecster

system_tests/bigquery.py

@@ -95,7 +95,7 @@ def test_update_dataset(self):
 
         # 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.
+        # response from upstream due to upstream rate limiting.
         @Retry(Forbidden, tries=2, delay=30)
         def update_dataset():
             dataset.update()
@@ -201,7 +201,7 @@ def test_update_table(self):
 
         # 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.
+        # response from upstream due to upstream rate limiting.
         @Retry(Forbidden, tries=2, delay=30)
         def create_dataset():
             dataset.create()

system_tests/retry.py

@@ -38,17 +38,20 @@ 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 self.exception as caught_exception:
+                except exception as caught_exception:
                     msg = ("%s, Trying again in %d seconds..." %
-                           (str(caught_exception), self.delay))
+                           (str(caught_exception), delay))
                     self.logger(msg)
 
-                    time.sleep(self.delay)
+                    time.sleep(delay)
                     tries_counter -= 1
-                    self.delay *= self.backoff
+                    delay *= backoff
             return to_wrap(*args, **kwargs)
 
         return wrapped_function