commit d25feee22126dd298149098219b93fe1f50bb241
author Kevin Cheng <kevcheng@google.com> Thu May 24 10:15:20 2018 -0700
committer Kevin Cheng <kevcheng@google.com> Thu May 24 10:15:20 2018 -0700
tree 8112434de1c22532f56158a04b0c4a5ffd2d6fab
parent a90343417cd98e0918018de7a06ab347446f46fc

fix up unittest failure due to utils.Retry changes.

Bug: None
Test: ./run_tests.sh
Change-Id: I0cbf736784837e74dcee03b61428691765c14285

internal/lib/gstorage_client.py

diff --git a/internal/lib/gstorage_client.py b/internal/lib/gstorage_client.py
index 6c2e1e9..07a6084 100755
--- a/internal/lib/gstorage_client.py
+++ b/internal/lib/gstorage_client.py
@@ -157,9 +157,10 @@
         """
         item = utils.RetryExceptionType(
             errors.ResourceNotFoundError,
-            max_retries=self.GET_OBJ_MAX_RETRY,
-            functor=self.Get,
-            sleep_multiplier=self.GET_OBJ_RETRY_SLEEP,
+            self.GET_OBJ_MAX_RETRY,
+            self.Get,
+            self.GET_OBJ_RETRY_SLEEP,
+            utils.DEFAULT_RETRY_BACKOFF_FACTOR,
             bucket_name=bucket_name,
             object_name=object_name)
         return item["selfLink"]

internal/lib/utils.py

diff --git a/internal/lib/utils.py b/internal/lib/utils.py
index 1c9ac9c..35729a6 100755
--- a/internal/lib/utils.py
+++ b/internal/lib/utils.py
@@ -35,6 +35,8 @@
 logger = logging.getLogger(__name__)
 
 SSH_KEYGEN_CMD = ["ssh-keygen", "-t", "rsa", "-b", "4096"]
+DEFAULT_RETRY_BACKOFF_FACTOR = 1
+DEFAULT_SLEEP_MULTIPLIER = 0
 
 
 class TempDir(object):
@@ -165,7 +167,7 @@
                                                 (attempt_count - 1))
                 else:
                     sleep = sleep_multiplier * attempt_count
-                    time.sleep(sleep)
+                time.sleep(sleep)
             else:
                 raise
 

internal/lib/utils_test.py

diff --git a/internal/lib/utils_test.py b/internal/lib/utils_test.py
index a5e845c..f00fb2f 100644
--- a/internal/lib/utils_test.py
+++ b/internal/lib/utils_test.py
@@ -176,12 +176,14 @@
             utils.RetryExceptionType, (KeyError, ValueError),
             num_retry,
             _RaiseAndRetry,
+            0, # sleep_multiplier
+            1, # retry_backoff_factor
             sentinel=sentinel)
         self.assertEqual(1 + num_retry, sentinel.alert.call_count)
 
     def testRetry(self):
         """Test Retry."""
-        self.Patch(time, "sleep")
+        mock_sleep = self.Patch(time, "sleep")
 
         def _RaiseAndRetry(sentinel):
             sentinel.alert()
@@ -194,12 +196,12 @@
             utils.RetryExceptionType, (ValueError, KeyError),
             num_retry,
             _RaiseAndRetry,
-            sleep_multiplier=1,
-            retry_backoff_factor=2,
+            1, # sleep_multiplier
+            2, # retry_backoff_factor
             sentinel=sentinel)
 
         self.assertEqual(1 + num_retry, sentinel.alert.call_count)
-        time.sleep.assert_has_calls(  #pylint: disable=no-member
+        mock_sleep.assert_has_calls(
             [
                 mock.call(1),
                 mock.call(2),