summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Hopkins <liamh@google.com>2019-11-13 10:48:50 -0800
committerZach Marano <zmarano@google.com>2019-11-13 10:48:50 -0800
commit4dcea10d22f1dc775cabe2b6d039daebc3683c43 (patch)
treef8ab299714d33620711801110c01eef526afe375
parent586528f7bbdc9296823b3d32421f1964d87dca35 (diff)
downloadgoogle-compute-image-packages-4dcea10d22f1dc775cabe2b6d039daebc3683c43.tar.gz
add a missed change for retries (#868)
-rw-r--r--packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py2
-rw-r--r--packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py
index 3de425b..fd07423 100644
--- a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py
+++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py
@@ -97,7 +97,7 @@ class ScriptRetriever(object):
if not self.token:
response = self.watcher.GetMetadata(
- self.token_metadata_key, recursive=False, retry=False)
+ self.token_metadata_key, recursive=False, retries=1)
if not response:
self.logger.info(
diff --git a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py
index 0df8830..4019bbe 100644
--- a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py
+++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py
@@ -89,7 +89,7 @@ class ScriptRetrieverTest(unittest.TestCase):
# GetMetadata includes a prefix, so remove it.
stripped_url = token_url.replace(metadata_prefix, '')
mock_get_metadata.assert_called_once_with(
- stripped_url, recursive=False, retry=False)
+ stripped_url, recursive=False, retries=1)
self.assertEqual(self.retriever.token, 'foo bar')
@@ -119,7 +119,7 @@ class ScriptRetrieverTest(unittest.TestCase):
prefix = 'http://metadata.google.internal/computeMetadata/v1/'
stripped_url = token_url.replace(prefix, '')
mock_get_metadata.assert_called_once_with(
- stripped_url, recursive=False, retry=False)
+ stripped_url, recursive=False, retries=1)
mock_download_url.assert_called_once_with(auth_url, self.dest_dir)
self.assertIsNone(self.retriever.token)