Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Warner <me@adamwarner.co.uk>2022-09-03 14:09:37 +0300
committerAdam Warner <me@adamwarner.co.uk>2022-09-03 14:09:37 +0300
commit46e1a87e9e80b9e31c03cfd3b68c0812e27fb920 (patch)
tree1f403e5034a40b8d5c28d1bb8c8aa6e574d8ff4a
parentd6cfa57ef35cefd41a8f2723852df4702a74f55f (diff)
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>
-rw-r--r--test/test_any_automated_install.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py
index 1e2a849b..7ec75078 100644
--- a/test/test_any_automated_install.py
+++ b/test/test_any_automated_install.py
@@ -880,13 +880,14 @@ def test_FTL_binary_installed_and_responsive_no_errors(host):
source /opt/pihole/basic-install.sh
create_pihole_user
funcOutput=$(get_binary_name)
+ echo "development" > /etc/pihole/ftlbranch
binary="pihole-FTL${funcOutput##*pihole-FTL}"
theRest="${funcOutput%pihole-FTL*}"
FTLdetect "${binary}" "${theRest}"
- pihole-FTL version
''')
+ version_check = host.run('pihole-FTL version')
expected_stdout = 'v'
- assert expected_stdout in installed_binary.stdout
+ assert expected_stdout in version_check.stdout
def test_IPv6_only_link_local(host):