refactor: pass in trigger to _run_ci

Signed-off-by: Lars Wirzenius <liw@liw.fi>

1 files changed, 8 insertions, 4 deletions

diff --git a/test-suite b/test-suite
index d66cfc9..277f8eb 100755
--- a/test-suite
+++ b/test-suite
@@ -82,8 +82,10 @@ class Suite:
     def _create_ci(self):
         return NativeCI(self.rad, self.config)
 
-    def _run_ci(self, ci, rid, commit):
-        trigger = Trigger(rid, commit)
+    def _create_valid_trigger(self, rid, commit):
+        return Trigger(rid, commit)
+
+    def _run_ci(self, trigger, ci, rid, commit):
         exit, resps, stderr = ci.run(trigger)
         debug(f"exit: {exit}")
         debug(f"responses: {resps}")
@@ -92,7 +94,8 @@ class Suite:
     def _test_case(self, repo_name, shell):
         rid, commit = self._setup(repo_name, shell)
         ci = self._create_ci()
-        return self._run_ci(ci, rid, commit)
+        trigger = self._create_valid_trigger(rid, commit)
+        return self._run_ci(trigger, ci, rid, commit)
 
     def test_happy_path(self):
         exit, resps, stderr = self._test_case("happy-path", "echo hello, world")
@@ -141,7 +144,8 @@ class Suite:
         commit = "8d947e182b096ec009e1c9eda9e6a67f5eef83d9"
 
         ci = self._create_ci()
-        exit, resps, stderr = self._run_ci(ci, rid, commit)
+        trigger = self._create_valid_trigger(rid, commit)
+        exit, resps, stderr = self._run_ci(trigger, ci, rid, commit)
 
         assert exit != 0
         assert len(resps) == 2