From 1c8647f692745b3fbfcac686bc2e1f9f52f18de9 Mon Sep 17 00:00:00 2001 From: casperklein Date: Fri, 4 Apr 2025 00:31:05 +0200 Subject: [PATCH 1/2] fix sunday Signed-off-by: casperklein --- src/crontab.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crontab.txt b/src/crontab.txt index 42d1668..d90ef3c 100644 --- a/src/crontab.txt +++ b/src/crontab.txt @@ -1,3 +1,3 @@ -59 1 * * 7 PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log +59 1 * * 0 PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log 00 00 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet 59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker From c4c3c3065aafc95c87a10302cfc4c8f14470f330 Mon Sep 17 00:00:00 2001 From: casperklein Date: Fri, 4 Apr 2025 19:16:10 +0200 Subject: [PATCH 2/2] add test: check if cronfile has a valid syntax Signed-off-by: casperklein --- test/tests/test_general.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/tests/test_general.py b/test/tests/test_general.py index 7b9f735..0502be3 100644 --- a/test/tests/test_general.py +++ b/test/tests/test_general.py @@ -12,11 +12,13 @@ def test_pihole_gid_env_var(docker): func = docker.run("id -g pihole") assert "456" in func.stdout + def test_pihole_ftl_version(docker): func = docker.run("pihole-FTL -vv") assert func.rc == 0 assert "Version:" in func.stdout + # 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 def test_pihole_ftl_clean_shutdown(docker): @@ -30,3 +32,14 @@ def test_pihole_ftl_clean_shutdown(docker): ) assert "INFO: ########## FTL terminated after" in func.stdout assert "(code 0)" in func.stdout + + +def test_cronfile_valid(docker): + func = docker.run( + """ + /usr/bin/crontab /crontab.txt + crond -d 8 -L /cron.log + grep 'parse error' /cron.log + """ + ) + assert "parse error" not in func.stdout