From 99f459e30fe8a9fd8a8b40e99f3a41814d7a1078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 30 Jun 2024 23:30:22 +0200 Subject: [PATCH] Using grep instead of tailing FTL.log as func.stdout only captures a few lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- test/tests/test_general.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tests/test_general.py b/test/tests/test_general.py index 78f1604..1da0579 100644 --- a/test/tests/test_general.py +++ b/test/tests/test_general.py @@ -14,14 +14,14 @@ def test_pihole_gid_env_var(docker): # Wait 5 seconds for startup, then kill the start.sh script -# Finally, tail the FTL log to see if it has been shut down cleanly +# Finally, grep 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 - tail -f /var/log/pihole-FTL.log + grep 'jmpret\|terminated' /var/log/pihole/FTL.log """ ) assert "INFO: Shutting down... // exit code 0 // jmpret 0" in func.stdout