Fix tries counter and change comments.

Author: daspecster

system_tests/bigquery.py

@@ -93,9 +93,9 @@ def test_update_dataset(self):
                  if grant.entity_id != 'projectWriters']
         dataset.access_grants = after
 
-        # We should try and keep `delay` and tries as low as possible to
-        # reduce test running time. tries=3 and delay=30 worked consistenly
-        # when updating a dataset.
+        # 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.
         @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 should try and keep `delay` and tries as low as possible to
-        # reduce test running time. tries=3 and delay=20 worked consistenly
-        # when creating a dataset.
+        # 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.
         @Retry(Forbidden, tries=2, delay=30)
         def create_dataset():
             dataset.create()

system_tests/retry.py

@@ -7,12 +7,6 @@
 class Retry(object):
     """Retry class for retrying eventually consistent resources in testing."""
 
-    logger = None
-    exception = None
-    tries = None
-    delay = None
-    backoff = None
-
     def __init__(self, exception, tries=4, delay=3, backoff=2, logger=None):
         """Retry calling the decorated function using an exponential backoff.
 
@@ -32,21 +26,19 @@ def __init__(self, exception, tries=4, delay=3, backoff=2, logger=None):
 
         :type logger: logging.Logger instance
         :param logger: Logger to use. If None, print.
-
-        :rtype: func
-        :returns: Retry wrapper function.
         """
 
         self.exception = exception
         self.tries = tries
         self.delay = delay
         self.backoff = backoff
-        self.logger = logger.warning if self.logger else six.print_
+        self.logger = logger.warning if logger else six.print_
 
     def __call__(self, to_wrap):
         @wraps(to_wrap)
         def wrapped_function(*args, **kwargs):
-            while self.tries > 1:
+            tries_counter = self.tries
+            while tries_counter > 0:
                 try:
                     return to_wrap(*args, **kwargs)
                 except self.exception as caught_exception:
@@ -55,7 +47,7 @@ def wrapped_function(*args, **kwargs):
                     self.logger(msg)
 
                     time.sleep(self.delay)
-                    self.tries -= 1
+                    tries_counter -= 1
                     self.delay *= self.backoff
             return to_wrap(*args, **kwargs)