diff options
Diffstat (limited to 'tests/unit/test_zuultrigger.py')
| -rw-r--r-- | tests/unit/test_zuultrigger.py | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/unit/test_zuultrigger.py b/tests/unit/test_zuultrigger.py index 0de479928..aeda12433 100644 --- a/tests/unit/test_zuultrigger.py +++ b/tests/unit/test_zuultrigger.py @@ -69,11 +69,12 @@ class TestZuulTriggerParentChangeEnqueued(ZuulTestCase): nonlocal zuultrigger_event_count if isinstance(args[0], ZuulTriggerEvent): zuultrigger_event_count += 1 - self.sched.trigger_event_queue.put_orig(*args, **kwargs) + self.scheds.first.sched.trigger_event_queue\ + .put_orig(*args, **kwargs) - self.sched.trigger_event_queue.put_orig = \ - self.sched.trigger_event_queue.put - self.sched.trigger_event_queue.put = counting_put + self.scheds.first.sched.trigger_event_queue.put_orig = \ + self.scheds.first.sched.trigger_event_queue.put + self.scheds.first.sched.trigger_event_queue.put = counting_put C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') C.addApproval('Verified', -1) @@ -150,11 +151,12 @@ class TestZuulTriggerParentChangeEnqueuedGithub(ZuulGithubAppTestCase): nonlocal zuultrigger_event_count if isinstance(args[0], ZuulTriggerEvent): zuultrigger_event_count += 1 - self.sched.trigger_event_queue.put_orig(*args, **kwargs) + self.scheds.first.sched.trigger_event_queue\ + .put_orig(*args, **kwargs) - self.sched.trigger_event_queue.put_orig = \ - self.sched.trigger_event_queue.put - self.sched.trigger_event_queue.put = counting_put + self.scheds.first.sched.trigger_event_queue.put_orig = \ + self.scheds.first.sched.trigger_event_queue.put + self.scheds.first.sched.trigger_event_queue.put = counting_put C = self.fake_github.openFakePullRequest('org/project', 'master', 'C') C.addLabel('for-check') # should go to check @@ -218,11 +220,17 @@ class TestZuulTriggerProjectChangeMerged(ZuulTestCase): self.assertTrue("project:{org/project} status:open" in self.fake_gerrit.queries) + # Ensure the gerrit driver has updated its cache after the + # previous comments were left: + self.fake_gerrit.addEvent(A.getChangeCommentEvent(2)) + self.fake_gerrit.addEvent(B.getChangeCommentEvent(2)) + self.waitUntilSettled() + # Reconfigure and run the test again. This is a regression # check to make sure that we don't end up with a stale trigger # cache that has references to projects from the old # configuration. - self.sched.reconfigure(self.config) + self.scheds.execute(lambda app: app.sched.reconfigure(app.config)) D.addApproval('Code-Review', 2) self.fake_gerrit.addEvent(D.addApproval('Approved', 1)) |