Merge pull request #1805 from pi-hole/development

Dev -> Master

Author: PromoFaux

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

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