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-10 01:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

removes TODOs and stickler warnings

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2021-07-19 17:50:37 +02:00
parent 5047e0e6e7
commit 28ffa7522b
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/test_automated_install.py
View file

@ -355,15 +355,6 @@ def test_installPihole_fresh_install_readableFiles(Pihole):
actual_rc = Pihole.run(check_man).rc actual_rc = Pihole.run(check_man).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc
# check not readable sudoers file # check not readable sudoers file
# TODO: directory may be readable?
# check_sudo = test_cmd.format(
# 'x', '/etc/sudoers.d/', piholeuser)
# actual_rc = Pihole.run(check_sudo).rc
# assert exit_status_success != actual_rc
# check_sudo = test_cmd.format(
# 'r', '/etc/sudoers.d/', piholeuser)
# actual_rc = Pihole.run(check_sudo).rc
# assert exit_status_success != actual_rc
check_sudo = test_cmd.format( check_sudo = test_cmd.format(
'r', '/etc/sudoers.d/pihole', piholeuser) 'r', '/etc/sudoers.d/pihole', piholeuser)
actual_rc = Pihole.run(check_sudo).rc actual_rc = Pihole.run(check_sudo).rc
@ -401,7 +392,6 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
confirms all web page assets from Core repo are readable confirms all web page assets from Core repo are readable
by $LIGHTTPD_USER on a fresh build by $LIGHTTPD_USER on a fresh build
''' '''
# TODO: also add IP address from setupVars?
piholeWebpage = [ piholeWebpage = [
"127.0.0.1", "127.0.0.1",
"pi.hole" "pi.hole"
@ -427,7 +417,6 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
chown {usergroup} "{compress}" chown {usergroup} "{compress}"
mkdir -p "{uploads}" mkdir -p "{uploads}"
chown {usergroup} "{uploads}" chown {usergroup} "{uploads}"
# TODO: changing these permissions might be wrong
chmod 0777 /var chmod 0777 /var
chmod 0777 /var/cache chmod 0777 /var/cache
chmod 0777 "{cache}" chmod 0777 "{cache}"
@ -548,7 +537,6 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
test_cmd = 'su --shell /bin/bash --command "test -{0} {1}" -p {2}' test_cmd = 'su --shell /bin/bash --command "test -{0} {1}" -p {2}'
# check files that need a running FTL to be created # check files that need a running FTL to be created
# readable and writeable pihole-FTL.db # readable and writeable pihole-FTL.db
# TODO: is created by FTL and if downloading fails this fails too?
check_FTLconf = test_cmd.format( check_FTLconf = test_cmd.format(
'r', '/etc/pihole/pihole-FTL.db', piholeuser) 'r', '/etc/pihole/pihole-FTL.db', piholeuser)
actual_rc = Pihole.run(check_FTLconf).rc actual_rc = Pihole.run(check_FTLconf).rc
@ -595,7 +583,6 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
for file in files: for file in files:
check_pihole = test_cmd.format('r', file, webuser) check_pihole = test_cmd.format('r', file, webuser)
actual_rc = Pihole.run(check_pihole).rc actual_rc = Pihole.run(check_pihole).rc
# TODO: which other files have to be checked?
# check web interface files # check web interface files
# change nameserver to pi-hole # change nameserver to pi-hole
# setting nameserver in /etc/resolv.conf to pi-hole does # setting nameserver in /etc/resolv.conf to pi-hole does
@ -608,10 +595,6 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
m = re.match(r"(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})", address) m = re.match(r"(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})", address)
return bool(m) return bool(m)
if installWebInterface is True: if installWebInterface is True:
# TODO: login into admin interface?
passwordcommand = 'grep "WEBPASSWORD" -c "/etc/pihole/setupVars.conf"'
passwd = Pihole.run(passwordcommand)
webpassword = passwd.stdout.strip()
check_pihole = test_cmd.format('r', webroot + '/pihole', webuser) check_pihole = test_cmd.format('r', webroot + '/pihole', webuser)
actual_rc = Pihole.run(check_pihole).rc actual_rc = Pihole.run(check_pihole).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc