From 0becc7615a74e50630a153030e4d0fa7aba87e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 1 Jun 2023 23:51:03 +0200 Subject: [PATCH] Run prestart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- test/test_any_automated_install.py | 7 ++++--- test/test_any_utils.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py index c1ef8af3..df9c4721 100644 --- a/test/test_any_automated_install.py +++ b/test/test_any_automated_install.py @@ -64,7 +64,7 @@ def test_installPihole_fresh_install_readableFiles(host): mock_command("dialog", {"*": ("", "0")}, host) # mock git pull mock_command_passthrough("git", {"pull": ("", "0")}, host) - # mock systemctl to not start lighttpd and FTL + # mock systemctl to not start FTL mock_command_2( "systemctl", { @@ -95,6 +95,7 @@ def test_installPihole_fresh_install_readableFiles(host): runUnattended=true useUpdateVars=true main + /opt/pihole/pihole-FTL-prestart.sh """ ) assert 0 == install.rc @@ -507,9 +508,9 @@ def test_FTL_download_aarch64_no_errors(host): 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( """ diff --git a/test/test_any_utils.py b/test/test_any_utils.py index 154b5e16..8c1ea521 100644 --- a/test/test_any_utils.py +++ b/test/test_any_utils.py @@ -129,7 +129,7 @@ def test_getFTLPIDFile_and_getFTLPID_custom(host): def test_getFTLConfigValue_getFTLConfigValue(host): """ 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( """