Tweak FTL test to ensure we don't get false positives on incompatible OS (Will remote Ub18 in a separate commit)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2022-09-03 12:09:37 +01:00
parent d6cfa57ef3
commit 46e1a87e9e
No known key found for this signature in database
GPG key ID: 872950F3ECF2B173

View file

@ -880,13 +880,14 @@ def test_FTL_binary_installed_and_responsive_no_errors(host):
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
create_pihole_user create_pihole_user
funcOutput=$(get_binary_name) funcOutput=$(get_binary_name)
echo "development" > /etc/pihole/ftlbranch
binary="pihole-FTL${funcOutput##*pihole-FTL}" binary="pihole-FTL${funcOutput##*pihole-FTL}"
theRest="${funcOutput%pihole-FTL*}" theRest="${funcOutput%pihole-FTL*}"
FTLdetect "${binary}" "${theRest}" FTLdetect "${binary}" "${theRest}"
pihole-FTL version
''') ''')
version_check = host.run('pihole-FTL version')
expected_stdout = 'v' expected_stdout = 'v'
assert expected_stdout in installed_binary.stdout assert expected_stdout in version_check.stdout
def test_IPv6_only_link_local(host): def test_IPv6_only_link_local(host):