Merge "Fix test race in test_periodic_override"

This commit is contained in:
Zuul 2019-03-25 20:27:04 +00:00 committed by Gerrit Code Review
commit 6f75088772
1 changed files with 5 additions and 4 deletions

View File

@ -272,15 +272,16 @@ class TestExecutorRepos(ZuulTestCase):
# This tests that we can override the branch in a timer
# trigger (mostly to ensure backwards compatability for jobs).
self.executor_server.hold_jobs_in_build = True
# Start timer trigger - also org/project
self.commitConfigUpdate('common-config',
'layouts/repo-checkout-timer-override.yaml')
self.sched.reconfigure(self.config)
p1 = 'review.example.com/org/project1'
projects = [p1]
self.create_branch('org/project1', 'stable/havana')
# Start timer trigger - also org/project
self.commitConfigUpdate('common-config',
'layouts/repo-checkout-timer-override.yaml')
self.sched.reconfigure(self.config)
# The pipeline triggers every second, so we should have seen
# several by now.
time.sleep(5)