From ca66c1ea9cd905b06618dbded58ff49b9b4f45a1 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 18 Jun 2023 18:01:54 +0100 Subject: [PATCH] Switch to new branch name for FTL v6 development Signed-off-by: Adam Warner --- test/test_any_automated_install.py | 2 +- test/test_any_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py index bc594304..a8e0e082 100644 --- a/test/test_any_automated_install.py +++ b/test/test_any_automated_install.py @@ -82,7 +82,7 @@ def test_installPihole_fresh_install_readableFiles(host): # Workaround to get FTLv6 installed until it reaches master branch host.run( """ - echo "new/http" > /etc/pihole/ftlbranch + echo "development-v6" > /etc/pihole/ftlbranch """ ) install = host.run( diff --git a/test/test_any_utils.py b/test/test_any_utils.py index 0f300457..9eee6885 100644 --- a/test/test_any_utils.py +++ b/test/test_any_utils.py @@ -137,7 +137,7 @@ def test_getFTLConfigValue_getFTLConfigValue(host): source /opt/pihole/basic-install.sh create_pihole_user funcOutput=$(get_binary_name) - echo "new/http" > /etc/pihole/ftlbranch + echo "development-v6" > /etc/pihole/ftlbranch binary="pihole-FTL${funcOutput##*pihole-FTL}" theRest="${funcOutput%pihole-FTL*}" FTLdetect "${binary}" "${theRest}"