Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-24 16:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't check and install old FTL config file

Browse source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2023-06-02 00:03:22 +02:00
parent 0becc7615a
commit 7da57c6acd
No known key found for this signature in database
3 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/test_any_automated_install.py
View file

@ -80,9 +80,10 @@ def test_installPihole_fresh_install_readableFiles(host):
host.run("command -v dnf > /dev/null && dnf install -y man")
host.run("command -v yum > /dev/null && yum install -y man")
# Workaround to get FTLv6 installed until it reaches master branch
host.run("""
echo "new/http" > /etc/pihole/ftlbranch
host.run(
"""
echo "new/http" > /etc/pihole/ftlbranch
"""
)
install = host.run(
"""
@ -141,13 +142,6 @@ def test_installPihole_fresh_install_readableFiles(host):
check_macvendor = test_cmd.format("r", "/etc/pihole/macvendor.db", piholeuser)
actual_rc = host.run(check_macvendor).rc
assert exit_status_success == actual_rc
# readable and writeable pihole-FTL.conf
check_FTLconf = test_cmd.format("r", "/etc/pihole/pihole-FTL.conf", piholeuser)
actual_rc = host.run(check_FTLconf).rc
assert exit_status_success == actual_rc
check_FTLconf = test_cmd.format("w", "/etc/pihole/pihole-FTL.conf", piholeuser)
actual_rc = host.run(check_FTLconf).rc
assert exit_status_success == actual_rc
# check readable and executable /etc/init.d/pihole-FTL
check_init = test_cmd.format("x", "/etc/init.d/pihole-FTL", piholeuser)
actual_rc = host.run(check_init).rc

3
test/test_any_utils.py
View file

@ -129,7 +129,8 @@ def test_getFTLPIDFile_and_getFTLPID_custom(host):
def test_getFTLConfigValue_getFTLConfigValue(host):
"""
Confirms getFTLConfigValue works (also assumes setFTLConfigValue works)
Requires FTL to be installed, so we do that first (taken from test_FTL_development_binary_installed_and_responsive_no_errors)
Requires FTL to be installed, so we do that first
(taken from test_FTL_development_binary_installed_and_responsive_no_errors)
"""
host.run(
"""