File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -75,10 +75,9 @@ start() {
7575 sleep 0.5
7676 done
7777
78- # Wait until the FTL log contains the "FTL started" message before continuing
79- while ! grep -q ' ########## FTL started' /var/log/pihole/FTL.log; do
80- sleep 0.5
81- done
78+ # Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds
79+ logsize_before=$( stat -c%s /var/log/pihole/FTL.log)
80+ pihole-FTL wait-for ' ########## FTL started' /var/log/pihole/FTL.log 10 " ${logsize_before} " > /dev/null
8281
8382 pihole updatechecker
8483 local versionsOutput
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ def test_pihole_ftl_architecture(docker):
5050
5151
5252# Wait 5 seconds for startup, then kill the start.sh script
53- # Finally, grep the FTL log to see if it has been shut down cleanly
53+ # Finally, check the FTL log to see if it has been shut down cleanly
5454def test_pihole_ftl_clean_shutdown (docker ):
5555 func = docker .run (
5656 """
You can’t perform that action at this time.
0 commit comments