test stop-pipeline-runner instead of sending on the event-bus (#103)

flosell · Apr 3, 2016 · e381096 · e381096
1 parent aa4de83
commit e381096
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/test/clj/lambdacd/internal/pipeline_state_test.clj b/test/clj/lambdacd/internal/pipeline_state_test.clj
@@ -30,5 +30,5 @@
                                 (update [_ _ _ _]
                                   (throw (Exception. "no update expected"))))
           updater-finished-ch (start-pipeline-state-updater pipeline-state ctx)]
-      (event-bus/publish ctx :stop-pipeline-state-updater {})
+      (tu/call-with-timeout 1000 (stop-pipeline-state-updater ctx updater-finished-ch))
       (is (not= {:status :timeout} (tu/get-or-timeout updater-finished-ch :timeout 1000))))))
diff --git a/test/clj/lambdacd/testsupport/test_util.clj b/test/clj/lambdacd/testsupport/test_util.clj
@@ -115,6 +115,9 @@
   `(async/go
      ~body))
 
+(defmacro call-with-timeout [timeout body]
+  `(get-or-timeout (start-waiting-for ~body) :timeout ~timeout))
+
 (defn start-waiting-for-result [key-to-wait-for result-channel]
   (async/go-loop []
     (let [[key value] (async/<! result-channel)]