mirror of
https://github.com/pi-hole/pi-hole
synced 2024-11-18 06:08:21 +00:00
Fix no_installs
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
parent
667418c71d
commit
366345e87e
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user