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-05 07:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

removes stickler errors

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2020-03-17 16:44:21 +01:00
parent e35d49c950
commit bf68eeaf35
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/test_automated_install.py
View file

@ -201,17 +201,23 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole):
if not webroot.strip(): if not webroot.strip():
webroot = '/var/www/html' webroot = '/var/www/html'
installWebInterface = True installWebInterface = True
interface = re.findall("^\s*INSTALL_WEB_INTERFACE=.*$", installWeb.stdout, re.MULTILINE) interface = re.findall(
"^\s*INSTALL_WEB_INTERFACE=.*$", installWeb.stdout, re.MULTILINE)
for match in interface: for match in interface:
testvalue = match.replace('INSTALL_WEB_INTERFACE=', '').strip().lower() testvalue = match.replace('INSTALL_WEB_INTERFACE=', '').strip().lower()
if not testvalue.strip(): if not testvalue.strip():
installWebInterface = testvalue == "true" installWebInterface = testvalue == "true"
installWebServer = True installWebServer = True
server = re.findall("^\s*INSTALL_WEB_SERVER=.*$", installWeb.stdout, re.MULTILINE) server = re.findall(
"^\s*INSTALL_WEB_SERVER=.*$", installWeb.stdout, re.MULTILINE)
for match in server: for match in server:
testvalue = match.replace('INSTALL_WEB_SERVER=', '').strip().lower() testvalue = match.replace('INSTALL_WEB_SERVER=', '').strip().lower()
if not testvalue.strip(): if not testvalue.strip():
installWebServer = testvalue == "true" installWebServer = testvalue == "true"
# if webserver install was not requested
# at least pihole must be able to read files
if installWebServer is False:
webuser = 'pihole'
exit_status_success = 0 exit_status_success = 0
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 directories above $webroot for read and execute permission # check directories above $webroot for read and execute permission
@ -241,7 +247,7 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole):
actual_rc = Pihole.run(check_admin).rc actual_rc = Pihole.run(check_admin).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc
# check web interface files # check web interface files
if installWebInterface == True: if installWebInterface is True:
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
@ -249,12 +255,12 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole):
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
# check most important files in $webroot for read permission # check most important files in $webroot for read permission
check_index = test_cmd.format('r', check_index = test_cmd.format(
webroot + '/pihole/index.php', webuser) 'r', webroot + '/pihole/index.php', webuser)
actual_rc = Pihole.run(check_index).rc actual_rc = Pihole.run(check_index).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc
check_blockpage = test_cmd.format('r', check_blockpage = test_cmd.format(
webroot + '/pihole/blockingpage.css', webuser) 'r', webroot + '/pihole/blockingpage.css', webuser)
actual_rc = Pihole.run(check_blockpage).rc actual_rc = Pihole.run(check_blockpage).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc