Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-29 01:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run prestart

Browse source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2023-06-01 23:51:03 +02:00
parent a4322c624f
commit 0becc7615a
No known key found for this signature in database
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test/test_any_automated_install.py
View file

@ -64,7 +64,7 @@ def test_installPihole_fresh_install_readableFiles(host):
mock_command("dialog", {"*": ("", "0")}, host) mock_command("dialog", {"*": ("", "0")}, host)
# mock git pull # mock git pull
mock_command_passthrough("git", {"pull": ("", "0")}, host) mock_command_passthrough("git", {"pull": ("", "0")}, host)
# mock systemctl to not start lighttpd and FTL # mock systemctl to not start FTL
mock_command_2( mock_command_2(
"systemctl", "systemctl",
{ {
@ -95,6 +95,7 @@ def test_installPihole_fresh_install_readableFiles(host):
runUnattended=true runUnattended=true
useUpdateVars=true useUpdateVars=true
main main
/opt/pihole/pihole-FTL-prestart.sh
""" """
) )
assert 0 == install.rc assert 0 == install.rc
@ -507,9 +508,9 @@ def test_FTL_download_aarch64_no_errors(host):
assert "error" not in download_binary.stdout.lower() assert "error" not in download_binary.stdout.lower()
def test_FTL_binary_installed_and_responsive_no_errors(host): def test_FTL_development_binary_installed_and_responsive_no_errors(host):
""" """
confirms FTL binary is copied and functional in installed location confirms FTL development binary is copied and functional in installed location
""" """
host.run( host.run(
""" """

2
test/test_any_utils.py
View file

@ -129,7 +129,7 @@ def test_getFTLPIDFile_and_getFTLPID_custom(host):
def test_getFTLConfigValue_getFTLConfigValue(host): def test_getFTLConfigValue_getFTLConfigValue(host):
""" """
Confirms getFTLConfigValue works (also assumes setFTLConfigValue works) Confirms getFTLConfigValue works (also assumes setFTLConfigValue works)
Requires FTL to be installed, so we do that first (taken from test_FTL_binary_installed_and_responsive_no_errors) Requires FTL to be installed, so we do that first (taken from test_FTL_development_binary_installed_and_responsive_no_errors)
""" """
host.run( host.run(
""" """