From 040d6e8106a2c4f369fe22c2d6875dc50608d2ab Mon Sep 17 00:00:00 2001
From: Valentin Boettcher <valentin@boettcher.cf>
Date: Sun, 2 Aug 2020 18:05:29 +0200
Subject: [PATCH] transition systemd commands to --no-block

---
 src/stream/commander/systemd.clj |  5 +++--
 test/stream/commander_test.clj   | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/stream/commander/systemd.clj b/src/stream/commander/systemd.clj
index ebe65bb..8b4d9ca 100644
--- a/src/stream/commander/systemd.clj
+++ b/src/stream/commander/systemd.clj
@@ -76,8 +76,9 @@
 ;; The commands are implemented synchronousily.
 
 (defn- run-systemd-command! [& commands]
-  (let [result (apply sh "systemctl" "-q" "--job-mode=replace"
-                      "--user" "--job-mode=replace" commands)]
+  (let [result (apply sh "systemctl" "--no-block"
+                      "--job-mode=replace" "--user" "--job-mode=replace"
+                      commands)]
     (if (= (:exit result) 0)
       true
       (throw+ {:type ::systemd-error
diff --git a/test/stream/commander_test.clj b/test/stream/commander_test.clj
index 920f48d..75372d2 100644
--- a/test/stream/commander_test.clj
+++ b/test/stream/commander_test.clj
@@ -66,21 +66,26 @@
 
     (testing "starting the service"
       (systemd/start-service! name)
-      (a/<!! (a/timeout 1000))
+      (while (= :activating (systemd/get-service-state! name))
+        (a/<!! (a/timeout 1000)))
       (is (= :active (systemd/get-service-state! name))))
 
+    (testing "stopping the service"
+      (systemd/stop-service! name)
+      (while (= :deactivating (systemd/get-service-state! name))
+        (a/<!! (a/timeout 1000)))
+      (is (= :inactive (systemd/get-service-state! name))))
+
     (testing "reading the logs"
       (let [logs (journal/get-logs! name)]
         (is (= (:message (second logs)) "test"))
         (is (= (:message (nth logs 2)) "error"))))
 
-    (testing "stopping the service"
-      (systemd/stop-service! name)
-      (is (= :inactive (systemd/get-service-state! name))))
-
     (testing "restarting the service"
       (systemd/start-service! name)
       (systemd/restart-service! name)
+      (while (= :activating (systemd/get-service-state! name))
+        (a/<!! (a/timeout 1000)))
       (is (= :active (systemd/get-service-state! name))))
 
     (testing "enabling the service"
@@ -141,7 +146,7 @@
     (is (= "a-b-c-d-" (#'api/sanitize-process-name "a*b C?d.")))))
 
 (deftest ffmpeg-process-management
-  (let [config {:cam-ip "nonexistent"
+  (let [config {:cam-ip "0.0.0.0"
                 :cam-rtsp-port "554"
                 :profile "bla"
                 :stream-server "server"
@@ -175,7 +180,7 @@
         (let  [prom (api/wait-for!
                      (:supervisor proc)
                      :event :failed
-                     :timeout 10000)]
+                     :timeout 100000)]
           (api/start-process! proc)
           (is (not (= :timeout @prom)))))