Use wait-for function also in tests

Signed-off-by: yubiuser <github@yubiuser.dev>

Author: yubiuser

src/start.sh

@@ -77,7 +77,7 @@ start() {
 
     #  Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds
     logsize_before=$(stat -c%s /var/log/pihole/FTL.log)
-    /usr/bin/pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "${logsize_before}"
+    pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "${logsize_before}" > /dev/null
 
     pihole updatechecker
     local versionsOutput

test/tests/test_general.py

@@ -50,17 +50,19 @@ def test_pihole_ftl_architecture(docker):
 
 
 # Wait 5 seconds for startup, then kill the start.sh script
-# Finally, grep the FTL log to see if it has been shut down cleanly
+# Finally, check the FTL log to see if it has been shut down cleanly
 def test_pihole_ftl_clean_shutdown(docker):
     func = docker.run(
         """
         sleep 5
         killall --signal 15 start.sh
-        sleep 5
-        grep 'terminated' /var/log/pihole/FTL.log
+        pihole-FTL wait-for '########## FTL terminated after' /var/log/pihole/FTL.log 10
     """
     )
-    assert "INFO: ########## FTL terminated after" in func.stdout
+    assert (
+        'Found string "########## FTL terminated after" in file /var/log/pihole/FTL.log'
+        in func.stdout
+    )
     assert "(code 0)" in func.stdout