diff options
| author | Max Illfelder <illfelder@users.noreply.github.com> | 2019-12-05 13:57:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 13:57:30 -0800 |
| commit | ee8099dcba5c438bddaa9492bd4d47f0a3b7eea6 (patch) | |
| tree | 078cdd7d2e938c139c869cc36f03cbd36271a70f /packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py | |
| parent | ae38eea4fad0ce9d2a5b5f4b9ec3e59d965256a7 (diff) | |
| download | google-compute-image-packages-ee8099dcba5c438bddaa9492bd4d47f0a3b7eea6.tar.gz | |
Roll forward a fix for #862. (#876)
Support retry limits in metadata retrieval without changing guest
behaviors.
Diffstat (limited to 'packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py')
| -rw-r--r-- | packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py index 1bce509..fe8aad9 100644 --- a/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py @@ -259,12 +259,12 @@ class MetadataWatcherTest(unittest.TestCase): metadata_key = 'instance/id' recursive = False wait = False - retry = True + retry_limit = None self.assertEqual( self.mock_watcher._HandleMetadataUpdate( metadata_key=metadata_key, recursive=recursive, wait=wait, - timeout=None, retry=retry), + timeout=None, retry_limit=retry_limit), {}) expected_calls = [ mock.call( @@ -282,12 +282,12 @@ class MetadataWatcherTest(unittest.TestCase): metadata_key = 'instance/id' recursive = False wait = False - retry = False + retry_limit = 0 self.assertIsNone( self.mock_watcher._HandleMetadataUpdate( metadata_key=metadata_key, recursive=recursive, wait=wait, - timeout=None, retry=retry)) + timeout=None, retry_limit=retry_limit)) expected_calls = [ mock.call( metadata_key=metadata_key, recursive=recursive, wait=wait, @@ -333,7 +333,8 @@ class MetadataWatcherTest(unittest.TestCase): self.assertEqual(self.mock_watcher.GetMetadata(), {}) mock_response.assert_called_once_with( - metadata_key='', recursive=True, wait=False, timeout=None, retry=True) + metadata_key='', recursive=True, wait=False, timeout=None, + retry_limit=None) self.mock_watcher.logger.exception.assert_not_called() def testGetMetadataArgs(self): @@ -342,15 +343,15 @@ class MetadataWatcherTest(unittest.TestCase): self.mock_watcher._HandleMetadataUpdate = mock_response metadata_key = 'instance/id' recursive = False - retry = False + retry_limit = None response = self.mock_watcher.GetMetadata( metadata_key=metadata_key, recursive=recursive, timeout=60, - retry=retry) + retry_limit=retry_limit) self.assertEqual(response, {}) mock_response.assert_called_once_with( metadata_key=metadata_key, recursive=False, wait=False, timeout=60, - retry=False) + retry_limit=None) self.mock_watcher.logger.exception.assert_not_called() |