diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-07 22:33:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-07 22:33:11 +0000 |
| commit | aed43d2530a96dd01716aeb37c4d673e3bfdc737 (patch) | |
| tree | 3b70ca5965005f35c1a9b50a080b8f71380d387a | |
| parent | 13bb14d4fd766b523d50a1ebbc92719fa797cbad (diff) | |
| parent | 1e26303bfc98645eac55230b100eb4dc6a937522 (diff) | |
| download | zuul-aed43d2530a96dd01716aeb37c4d673e3bfdc737.tar.gz | |
Merge "Fix race in test_crd_check_duplicate"
| -rwxr-xr-x | tests/test_scheduler.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index c35fb58d3..76e91cee1 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -3453,7 +3453,7 @@ For CI problems and help debugging, contact ci@example.org""" def test_crd_check_duplicate(self): "Test duplicate check in independent pipelines" - self.gearman_server.hold_jobs_in_queue = True + self.worker.hold_jobs_in_build = True A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') check_pipeline = self.sched.layout.pipelines['check'] @@ -3476,13 +3476,14 @@ 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.gearman_server.release('.*-merge') - self.gearman_server.release('project1-.*') + self.worker.release('.*-merge') + self.worker.release('project1-.*') self.waitUntilSettled() - self.gearman_server.release('.*-merge') - self.gearman_server.release('project1-.*') + self.worker.release('.*-merge') + self.worker.release('project1-.*') self.waitUntilSettled() - self.gearman_server.release() + self.worker.hold_jobs_in_build = False + self.worker.release() self.waitUntilSettled() self.assertEqual(A.data['status'], 'NEW') |