commit fc98bd6908642487c92f44ad0e5cf46fb73c26a1
author Jenkins <jenkins@review.openstack.org> Tue Jun 06 04:06:08 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 06 04:06:08 2017 +0000
tree 44d5535d815606d53eb254b91ffb2e09c731c8a9
parent c8e85ba48754a062a2f314be1df34de11e37b86f
parent 7c60e4451b48227b02cfd4e8f72b404cd88becb7

Merge "Fix race in gerrit+github test" into feature/zuulv3

tests/unit/test_multi_driver.py

diff --git a/tests/unit/test_multi_driver.py b/tests/unit/test_multi_driver.py
index a1107de..864bd31 100644
--- a/tests/unit/test_multi_driver.py
+++ b/tests/unit/test_multi_driver.py
@@ -28,10 +28,10 @@
 
         A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
         self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
+        self.waitUntilSettled()
 
         B = self.fake_github.openFakePullRequest('org/project1', 'master', 'B')
         self.fake_github.emitEvent(B.getPullRequestOpenedEvent())
-
         self.waitUntilSettled()
 
         self.assertEqual(2, len(self.builds))