Merge "Fix race in test_crd_gate_unknown" into feature/zuulv3
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 3ba402d..de8246c 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -3858,9 +3858,12 @@
self.assertEqual(B.reported, 0)
self.assertEqual(len(self.history), 0)
- # Simulate change B being gated outside this layout
- self.fake_gerrit.addEvent(B.addApproval('approved', 1))
+ # Simulate change B being gated outside this layout Set the
+ # change merged before submitting the event so that when the
+ # event triggers a gerrit query to update the change, we get
+ # the information that it was merged.
B.setMerged()
+ self.fake_gerrit.addEvent(B.addApproval('approved', 1))
self.waitUntilSettled()
self.assertEqual(len(self.history), 0)