Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-26 06:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Test fixes

Browse source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2023-06-01 19:29:47 +01:00
parent 7351a4d3b1
commit 792b0d419b
No known key found for this signature in database
3 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
automated install/basic-install.sh
View file

@ -1566,17 +1566,6 @@ create_pihole_user() {
fi
}
finalExports() {
# shellcheck source=advanced/Scripts/webpage.sh
source "${PI_HOLE_LOCAL_REPO}/advanced/Scripts/webpage.sh"
# Look for DNS server settings which would have to be reapplied
ProcessDNSSettings
# Look for DHCP server settings which would have to be reapplied
ProcessDHCPSettings
}
# Install the logrotate script
installLogrotate() {
local str="Installing latest logrotate script"
@ -1649,8 +1638,6 @@ installPihole() {
# install a man page entry for pihole
install_manpage
finalExports
}
# SELinux

27
test/test_any_automated_install.py
View file

@ -781,30 +781,3 @@ def test_package_manager_has_web_deps(host):
assert "No package" not in output.stdout
assert output.rc == 0
def test_webpage_sh_valid_domain(host):
"""Confirms checkDomain function in webpage.sh works as expected"""
check1 = host.run(
"""
source /opt/pihole/webpage.sh
checkDomain "pi-hole.net"
"""
)
check2 = host.run(
"""
source /opt/pihole/webpage.sh
checkDomain "ab.pi-hole.net"
"""
)
check3 = host.run(
"""
source /opt/pihole/webpage.sh
checkDomain "abc.pi-hole.net"
"""
)
assert "pi-hole.net" in check1.stdout
assert "ab.pi-hole.net" in check2.stdout
assert "abc.pi-hole.net" in check3.stdout

2
test/test_any_utils.py
View file

@ -151,4 +151,4 @@ def test_getFTLConfigValue_getFTLConfigValue(host):
"""
)
assert '[ "9.9.9.9" ]' in output.stdout
assert '[ 9.9.9.9 ]' in output.stdout