diff options
| author | James E. Blair <jeblair@redhat.com> | 2020-07-28 13:40:14 -0700 |
|---|---|---|
| committer | James E. Blair <jeblair@redhat.com> | 2020-07-28 13:40:14 -0700 |
| commit | 5804c4c293243dc8b45ef02d11eb5bcbcc6a1049 (patch) | |
| tree | bcfecc4b57697e8a5c3f7a659c86d300f4a4fd11 /tests/unit/test_executor.py | |
| parent | db38a8a27505f83acea58aa189fc5fcb1620cfef (diff) | |
| download | zuul-5804c4c293243dc8b45ef02d11eb5bcbcc6a1049.tar.gz | |
Sequence builds in test_executor
These assertions assume the builds are in a specific order. To
ensure that, wait for each build to pause before starting the next.
Change-Id: I2e62a0197b833e36522aac14dc8f4d4f386eccf5
Diffstat (limited to 'tests/unit/test_executor.py')
| -rw-r--r-- | tests/unit/test_executor.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/unit/test_executor.py b/tests/unit/test_executor.py index 6c399dd63..353ffa87f 100644 --- a/tests/unit/test_executor.py +++ b/tests/unit/test_executor.py @@ -106,8 +106,8 @@ class TestExecutorRepos(ZuulTestCase): A.addApproval('Code-Review', 2) B.addApproval('Code-Review', 2) self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) - self.waitUntilSettled() self.assertEqual(2, len(self.builds), "Two builds are running") @@ -145,9 +145,10 @@ class TestExecutorRepos(ZuulTestCase): B.addApproval('Code-Review', 2) C.addApproval('Code-Review', 2) self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) - self.waitUntilSettled() self.assertEqual(3, len(self.builds), "Three builds are running") @@ -205,10 +206,12 @@ class TestExecutorRepos(ZuulTestCase): C.addApproval('Code-Review', 2) D.addApproval('Code-Review', 2) self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(B.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(C.addApproval('Approved', 1)) + self.waitUntilSettled() self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) - self.waitUntilSettled() self.assertEqual(4, len(self.builds), "Four builds are running") |