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-21 06:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

changes stdout to rc

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2020-03-05 14:58:01 +01:00
parent 81e717256e
commit 002d4ed774
1 changed files with 47 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

85
test/test_automated_install.py
View file

@ -140,9 +140,10 @@ def test_installPiholeWeb_fresh_install_readableBlockpage(Pihole):
umask 0027 umask 0027
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
distro_check > /dev/null 2>&1 distro_check > /dev/null 2>&1
echo "LIGHTTPD_USER=${LIGHTTPD_USER}"
install_dependent_packages ${PIHOLE_WEB_DEPS[@]} > /dev/null 2>&1 install_dependent_packages ${PIHOLE_WEB_DEPS[@]} > /dev/null 2>&1
installPiholeWeb installPiholeWeb
echo "LIGHTTPD_USER=${LIGHTTPD_USER}"
echo "webroot=${webroot}"
''') ''')
expected_stdout = info_box + ' Installing blocking page...' expected_stdout = info_box + ' Installing blocking page...'
assert expected_stdout in installWeb.stdout assert expected_stdout in installWeb.stdout
@ -160,47 +161,53 @@ def test_installPiholeWeb_fresh_install_readableBlockpage(Pihole):
user = re.findall("^\s*LIGHTTPD_USER=.*$", installWeb.stdout, re.MULTILINE) user = re.findall("^\s*LIGHTTPD_USER=.*$", installWeb.stdout, re.MULTILINE)
for match in user: for match in user:
webuser = match.replace('LIGHTTPD_USER=', '').strip() webuser = match.replace('LIGHTTPD_USER=', '').strip()
exit_status_success = '0' webroot = ''
test_command = 'echo $(su --command "test -{0} {1}" -p {2}) $?' user = re.findall("^\s*webroot=.*$", installWeb.stdout, re.MULTILINE)
for match in user:
webroot = match.replace('webroot=', '').strip()
if not webroot.strip():
webroot = '/var/www/html'
exit_status_success = 0
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
check_var = test_command.format('r', '/var', webuser) check_var = test_cmd.format('r', '/var', webuser)
expected_stdout = Pihole.run(check_var).stdout actual_rc = Pihole.run(check_var).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_var = test_command.format('x', '/var', webuser) check_var = test_cmd.format('x', '/var', webuser)
expected_stdout = Pihole.run(check_var).stdout actual_rc = Pihole.run(check_var).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_www = test_command.format('r', '/var/www', webuser) check_www = test_cmd.format('r', '/var/www', webuser)
expected_stdout = Pihole.run(check_www).stdout actual_rc = Pihole.run(check_www).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_www = test_command.format('x', '/var/www', webuser) check_www = test_cmd.format('x', '/var/www', webuser)
expected_stdout = Pihole.run(check_www).stdout actual_rc = Pihole.run(check_www).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_html = test_command.format('r', '/var/www/html', webuser) check_html = test_cmd.format('r', '/var/www/html', webuser)
expected_stdout = Pihole.run(check_html).stdout actual_rc = Pihole.run(check_html).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_html = test_command.format('x', '/var/www/html', webuser) check_html = test_cmd.format('x', '/var/www/html', webuser)
expected_stdout = Pihole.run(check_html).stdout actual_rc = Pihole.run(check_html).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
# check directories below $webroot for read and execute permission # check directories below $webroot for read and execute permission
check_admin = test_command.format('r', '/var/www/html/admin', webuser) check_admin = test_cmd.format('r', webroot + '/admin', webuser)
expected_stdout = Pihole.run(check_admin).stdout actual_rc = Pihole.run(check_admin).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_admin = test_command.format('x', '/var/www/html/admin', webuser) check_admin = test_cmd.format('x', webroot + '/admin', webuser)
expected_stdout = Pihole.run(check_admin).stdout actual_rc = Pihole.run(check_admin).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_pihole = test_command.format('r', '/var/www/html/pihole', webuser) check_pihole = test_cmd.format('r', webroot + '/pihole', webuser)
expected_stdout = Pihole.run(check_pihole).stdout actual_rc = Pihole.run(check_pihole).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_pihole = test_command.format('x', '/var/www/html/pihole', webuser) check_pihole = test_cmd.format('x', webroot + '/pihole', webuser)
expected_stdout = Pihole.run(check_pihole).stdout actual_rc = Pihole.run(check_pihole).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
# check most important files in $webroot for read permission by # check most important files in $webroot for read permission by
check_index = test_command.format('r', '/var/www/html/admin/index.php', webuser) check_index = test_cmd.format('r', webroot + '/admin/index.php', webuser)
expected_stdout = Pihole.run(check_index).stdout actual_rc = Pihole.run(check_index).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
check_blockpage = test_command.format('r', '/var/www/html/admin/blockingpage.css', webuser) check_blockpage = test_cmd.format('r', webroot + '/admin/blockingpage.css', webuser)
expected_stdout = Pihole.run(check_blockpage).stdout actual_rc = Pihole.run(check_blockpage).rc
assert exit_status_success in expected_stdout assert exit_status_success == actual_rc
def test_update_package_cache_success_no_errors(Pihole): def test_update_package_cache_success_no_errors(Pihole):