diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2015-03-02 12:38:14 -0800 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2015-03-02 12:38:14 -0800 |
| commit | dd84982d509a5dadb115acf776d3679c2b12783f (patch) | |
| tree | 84e6e83a875d08b53d9c472b4eca51bd16bda2eb | |
| parent | db8b89bef7160a40489bd193888adbab319718c3 (diff) | |
| download | zuul-dd84982d509a5dadb115acf776d3679c2b12783f.tar.gz | |
Fix race in CRD duplicates test
The CRD duplicates test was removing the job hold flag which meant all
FakeBuild threads were racing each other to update the FakeWorker
history. Avoid this by releasing jobs for one change at a time and
letting them settle before checking the job history list.
Change-Id: I86ee058546d2f0b833106725b419a8adcb1b7508
| -rwxr-xr-x | tests/test_scheduler.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index b44dba6c1..fe69fa99d 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -3399,10 +3399,13 @@ For CI problems and help debugging, contact ci@example.org""" self.waitUntilSettled() self.assertEqual(len(check_pipeline.getAllItems()), 3) - self.gearman_server.hold_jobs_in_queue = False + # Release jobs in order to avoid races with change A jobs + # finishing before change B jobs. self.gearman_server.release('.*-merge') + self.gearman_server.release('project1-.*') self.waitUntilSettled() self.gearman_server.release('.*-merge') + self.gearman_server.release('project1-.*') self.waitUntilSettled() self.gearman_server.release() self.waitUntilSettled() |