Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-25 23:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch to new branch name for FTL v6 development (#5319)

Browse source
This commit is contained in:
Adam Warner 2023-06-18 22:17:39 +01:00 committed by GitHub
commit 85d256d53c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/test_any_automated_install.py
View file

@ -82,7 +82,7 @@ def test_installPihole_fresh_install_readableFiles(host):
# Workaround to get FTLv6 installed until it reaches master branch # Workaround to get FTLv6 installed until it reaches master branch
host.run( host.run(
""" """
echo "new/http" > /etc/pihole/ftlbranch echo "development-v6" > /etc/pihole/ftlbranch
""" """
) )
install = host.run( install = host.run(

2
test/test_any_utils.py
View file

@ -137,7 +137,7 @@ def test_getFTLConfigValue_getFTLConfigValue(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 "new/http" > /etc/pihole/ftlbranch echo "development-v6" > /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}"