Add pipeline source
A TriggerEvent may originate from a trigger that does not represent
the canonical location of the project source. For instance, the
timer trigger strangely depends on the gerrit trigger to actually
handle Git operations behind the scenes. Instead, make an explicit
association between pipelines and their source triggers so that
their event trigger does not need to have that implicit association.
This is a step toward having pipelines support multiple triggers
(they already support multiple reporters).
Change-Id: Ie80ffde411fe40fddfc4496b7adb0004f660c48c
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 52c6c81..fe6a584 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -651,19 +651,19 @@
"Test whether a change is ready to merge"
# TODO: move to test_gerrit (this is a unit test!)
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
- trigger = self.sched.layout.pipelines['gate'].trigger
- a = self.sched.triggers['gerrit'].getChange(1, 2)
+ source = self.sched.layout.pipelines['gate'].source
+ a = source._getChange(1, 2)
mgr = self.sched.layout.pipelines['gate'].manager
- self.assertFalse(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
+ self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
A.addApproval('CRVW', 2)
- a = trigger.getChange(1, 2, refresh=True)
- self.assertFalse(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
+ a = source._getChange(1, 2, refresh=True)
+ self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
A.addApproval('APRV', 1)
- a = trigger.getChange(1, 2, refresh=True)
- self.assertTrue(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
- trigger.maintainCache([])
+ a = source._getChange(1, 2, refresh=True)
+ self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds()))
+ source.maintainCache([])
def test_build_configuration(self):
"Test that zuul merges the right commits for testing"