arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-06 22:20:54 +00:00
Code Issues Releases Wiki Activity

while v6 is still not released, update tests in master to NOT use development branch of FTL

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2024-12-29 12:35:32 +00:00
parent 22b6dc7dae
commit d972ffa53a
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_any_automated_install.py
View File

@ -179,7 +179,7 @@ def test_installPihole_fresh_install_readableFiles(host):
# Install FTL's development branch to get the latest features # Install FTL's development branch to get the latest features
host.run( host.run(
""" """
echo "development" > /etc/pihole/ftlbranch echo "master" > /etc/pihole/ftlbranch
""" """
) )
install = host.run( install = host.run(
@ -440,7 +440,7 @@ def test_installPihole_fresh_install_readableBlockpage(host, test_webpage):
# Install FTL's development branch to get the latest features # Install FTL's development branch to get the latest features
host.run( host.run(
""" """
echo "development" > /etc/pihole/ftlbranch echo "master" > /etc/pihole/ftlbranch
""" """
) )
installWeb = host.run( installWeb = host.run(
@ -893,7 +893,7 @@ 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 echo "master" > /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}"