diff options
| author | James E. Blair <jeblair@hp.com> | 2015-05-07 15:47:37 -0700 |
|---|---|---|
| committer | James E. Blair <jeblair@hp.com> | 2015-05-07 17:01:54 -0700 |
| commit | d7650853007205b72fae6e83dd8f4fbeb8d0a9e4 (patch) | |
| tree | 5973a92a83353ec64700bea0da138680d848a035 | |
| parent | aed43d2530a96dd01716aeb37c4d673e3bfdc737 (diff) | |
| download | zuul-d7650853007205b72fae6e83dd8f4fbeb8d0a9e4.tar.gz | |
Fix race in test_crd_check_duplicate more
The previous fix was insufficient because multiple merge jobs
could be run at once. Using the new orderedRelease method however
should be sufficient, and it ensures only one job runs and finishes
at a time.
The previous code was more appropriate for a test of a gate
pipeline and was probably copied from it.
Change-Id: I0534c7ce6dd473cb71ba37c8c0fedef8e5ca72a5
| -rwxr-xr-x | tests/test_scheduler.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 76e91cee1..3b59e3e2a 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -3476,12 +3476,7 @@ For CI problems and help debugging, contact ci@example.org""" # Release jobs in order to avoid races with change A jobs # finishing before change B jobs. - self.worker.release('.*-merge') - self.worker.release('project1-.*') - self.waitUntilSettled() - self.worker.release('.*-merge') - self.worker.release('project1-.*') - self.waitUntilSettled() + self.orderedRelease() self.worker.hold_jobs_in_build = False self.worker.release() self.waitUntilSettled() |