Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1805 from pi-hole/development

Browse Source 
Dev -> Master
This commit is contained in:
Adam Warner
2025-04-04 18:51:28 +01:00
committed by GitHub
parent 1213fc630d 3c86c4a7ac
commit 4decae85fb
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crontab.txt
View File

@@ -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 00 00 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet
59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker 59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker

13
test/tests/test_general.py
View File

@@ -12,11 +12,13 @@ def test_pihole_gid_env_var(docker):
func = docker.run("id -g pihole") func = docker.run("id -g pihole")
assert "456" in func.stdout assert "456" in func.stdout
def test_pihole_ftl_version(docker): def test_pihole_ftl_version(docker):
func = docker.run("pihole-FTL -vv") func = docker.run("pihole-FTL -vv")
assert func.rc == 0 assert func.rc == 0
assert "Version:" in func.stdout assert "Version:" in func.stdout
# Wait 5 seconds for startup, then kill the start.sh script # 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, grep the FTL log to see if it has been shut down cleanly
def test_pihole_ftl_clean_shutdown(docker): 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 "INFO: ########## FTL terminated after" in func.stdout
assert "(code 0)" 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