From 366345e87e6dc94294ea746e8cea8f781864a9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 4 Jun 2023 20:20:18 +0200 Subject: [PATCH] Fix no_installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- automated install/basic-install.sh | 2 +- test/test_any_automated_install.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 681b6798..c4ea4764 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2174,7 +2174,7 @@ main() { # this early on as FTL is a hard dependency for Pi-hole local funcOutput funcOutput=$(get_binary_name) #Store output of get_binary_name here - # Abort early if this processor is not supported (get_binary_name returnS empty string) + # Abort early if this processor is not supported (get_binary_name returns empty string) if [[ "${funcOutput}" == "" ]]; then printf " %b Upgrade/install aborted\\n" "${CROSS}" "${DISTRO_NAME}" exit 1 diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py index 4a86d28e..5c902c2b 100644 --- a/test/test_any_automated_install.py +++ b/test/test_any_automated_install.py @@ -286,12 +286,9 @@ def test_FTL_detect_armv4t_no_install(host): detectPlatform = host.run( """ source /opt/pihole/basic-install.sh - create_pihole_user - funcOutput=$(get_binary_name) + get_binary_name """ ) - expected_stdout = info_box + " FTL Checks..." - assert expected_stdout in detectPlatform.stdout expected_stdout = cross_box + (" ARM processor without hard-float support detected") assert expected_stdout in detectPlatform.stdout @@ -314,12 +311,9 @@ def test_FTL_detect_armv5te_no_install(host): detectPlatform = host.run( """ source /opt/pihole/basic-install.sh - create_pihole_user - funcOutput=$(get_binary_name) + get_binary_name """ ) - expected_stdout = info_box + " FTL Checks..." - assert expected_stdout in detectPlatform.stdout expected_stdout = cross_box + (" ARM processor without hard-float support detected") assert expected_stdout in detectPlatform.stdout