diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-03 21:59:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-03 21:59:02 +0000 |
| commit | bdc579b22f45c71adb7e48d684306600b370fac9 (patch) | |
| tree | 7a882c39b249c5ad28fe7d8a9216d8078c3cdf79 | |
| parent | b5da673ea30265241b5d2643ea7312ed690ee126 (diff) | |
| parent | dd84982d509a5dadb115acf776d3679c2b12783f (diff) | |
| download | zuul-bdc579b22f45c71adb7e48d684306600b370fac9.tar.gz | |
Merge "Fix race in CRD duplicates test"
| -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 8e0a54bc0..0779bfa2d 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -3438,10 +3438,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() |