From 412b78701c38cfe640d5c8d7f6db910bf3c3a39c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 17 Sep 2020 10:34:38 -0700 Subject: [PATCH] Followup test improvement to use iterate_timeout This was suggested in review. Pushing this so we don't forget. Change-Id: If899965db23d821dfc45d77629a86e3c854be172 --- nodepool/tests/unit/test_builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nodepool/tests/unit/test_builder.py b/nodepool/tests/unit/test_builder.py index dce1e45f1..60cd3362d 100644 --- a/nodepool/tests/unit/test_builder.py +++ b/nodepool/tests/unit/test_builder.py @@ -440,7 +440,7 @@ class TestNodePoolBuilder(tests.DBTestCase): # Wait for the build to fail before we replace our config. Otherwise # we may replace the config before we build the image. found = False - while not found: + for _ in iterate_timeout(10, Exception, 'image builds to fail', 0.1): builds = self.zk.getBuilds('fake-image') for build in builds: # Lexicographical order @@ -451,6 +451,8 @@ class TestNodePoolBuilder(tests.DBTestCase): found = build.id break time.sleep(0.1) + if found: + break # Now replace the config with a valid config and check that the image # builds successfully. Finally check that the failed image is gone.