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-06 07:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

use installPihole instead of installPiholeWeb in test

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

23
test/test_automated_install.py
View file

@ -132,31 +132,22 @@ def test_installPiholeWeb_fresh_install_no_errors(Pihole):
assert 'blockingpage.css' in web_directory assert 'blockingpage.css' in web_directory
def test_installPiholeWeb_fresh_install_readableBlockpage(Pihole): def test_installPihole_fresh_install_readableBlockpage(Pihole):
''' '''
confirms all web page assets from Core repo are readable by $LIGHTTPD_USER on a fresh build confirms all web page assets from Core repo are readable by $LIGHTTPD_USER on a fresh build
''' '''
installWeb = Pihole.run(''' installWeb = Pihole.run('''
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
install_dependent_packages ${PIHOLE_WEB_DEPS[@]} > /dev/null 2>&1 clone_or_update_repos
installPiholeWeb install_dependent_packages ${PIHOLE_WEB_DEPS[@]}
create_pihole_user
installPihole
echo "LIGHTTPD_USER=${LIGHTTPD_USER}" echo "LIGHTTPD_USER=${LIGHTTPD_USER}"
echo "webroot=${webroot}" echo "webroot=${webroot}"
''') ''')
expected_stdout = info_box + ' Installing blocking page...' assert 0 == installWeb.rc
assert expected_stdout in installWeb.stdout
expected_stdout = tick_box + (' Creating directory for blocking page, '
'and copying files')
assert expected_stdout in installWeb.stdout
expected_stdout = info_box + ' Backing up index.lighttpd.html'
assert expected_stdout in installWeb.stdout
expected_stdout = ('No default index.lighttpd.html file found... '
'not backing up')
assert expected_stdout in installWeb.stdout
expected_stdout = tick_box + ' Installing sudoer file'
assert expected_stdout in installWeb.stdout
webuser = '' webuser = ''
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: