From 2da07128e64016fe6daf9ef4aa6cd9c280977b60 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Mon, 24 Sep 2018 07:25:06 +0200 Subject: [PATCH] Fix race in test_launchNode_delete_error Deleting failed nodes is offloaded to the DeletedNodeWorker. Thus the deletion can be a bit delayed and we need to wait for delete_success instead of asserting it. Change-Id: I5b425707fac5250367f6f3164e803951b10196cb --- nodepool/tests/test_launcher.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nodepool/tests/test_launcher.py b/nodepool/tests/test_launcher.py index 7c31e64d4..492f84ed6 100644 --- a/nodepool/tests/test_launcher.py +++ b/nodepool/tests/test_launcher.py @@ -1527,8 +1527,13 @@ class TestLauncher(tests.DBTestCase): self.zk.storeNodeRequest(req) req = self.waitForNodeRequest(req) + + # The deletion of the node can be delayed so wait for it. + while True: + if fake_client.delete_success: + break + time.sleep(0.1) self.assertTrue(fake_client.launch_success) - self.assertTrue(fake_client.delete_success) self.assertEqual(fake_client.times_to_fail_delete, fake_client.times_failed_delete) self.assertEqual(fake_client.times_to_fail_launch,