summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-07 21:02:24 +0000
committerGerrit Code Review <review@openstack.org>2019-03-07 21:02:24 +0000
commit7ca96c254824e542cd13dfec3b7933c28ad52c51 (patch)
tree1398d47f723cb00793fd77351079296cc4f83516
parent6a9d02983430cd2cad7b21d13cf21ff874e1e8ce (diff)
parent878fcc939741f3514cd1562fd9c7e621267a2fba (diff)
Merge "Fix test race in test_client_dequeue_change_by_ref"
-rw-r--r--tests/unit/test_scheduler.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 3611cde..417fbeb 100644
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -3965,9 +3965,12 @@ class TestScheduler(ZuulTestCase):
3965 self.executor_server.hold_jobs_in_build = True 3965 self.executor_server.hold_jobs_in_build = True
3966 self.commitConfigUpdate('common-config', 'layouts/timer.yaml') 3966 self.commitConfigUpdate('common-config', 'layouts/timer.yaml')
3967 self.sched.reconfigure(self.config) 3967 self.sched.reconfigure(self.config)
3968 self.waitUntilSettled()
3969 3968
3970 time.sleep(5) 3969 # We expect that one build for each branch (master and stable) appears.
3970 for _ in iterate_timeout(30, 'Wait for two builds that are hold'):
3971 if len(self.builds) == 2:
3972 break
3973 self.waitUntilSettled()
3971 3974
3972 client.dequeue( 3975 client.dequeue(
3973 tenant='tenant-one', 3976 tenant='tenant-one',