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-15 11:59:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

add --add-cap=NET_ADMIN to enable FTL start

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2020-05-10 18:18:11 +02:00
parent e82b136b8a
commit e665998160
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/conftest.py
View file

@ -66,7 +66,7 @@ def args(request):
''' '''
-t became required when tput began being used -t became required when tput began being used
''' '''
return '-t -d' return '-t -d --cap-add=NET_ADMIN'
@pytest.fixture(params=['debian', 'centos', 'fedora']) @pytest.fixture(params=['debian', 'centos', 'fedora'])

41
test/test_automated_install.py
View file

@ -479,6 +479,7 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
) )
) )
FTLcommand = dedent('''\"\" FTLcommand = dedent('''\"\"
set -x
/etc/init.d/pihole-FTL restart /etc/init.d/pihole-FTL restart
echo \"\"''') echo \"\"''')
mock_command_run( mock_command_run(
@ -524,10 +525,10 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
setup_var_file += "EOF\n" setup_var_file += "EOF\n"
Pihole.run(setup_var_file) Pihole.run(setup_var_file)
# TODO: set in dependance of currently build branch # TODO: set in dependance of currently build branch
b = Pihole.run('mkdir -p /etc/pihole && echo "development" > /etc/pihole/ftlbranch'); # b = Pihole.run('mkdir -p /etc/pihole && printf "development" > /etc/pihole/ftlbranch');
assert 0 == b.rc # assert 0 == b.rc
b = Pihole.run('cat /etc/pihole/ftlbranch'); # b = Pihole.run('cat /etc/pihole/ftlbranch');
print(b.stdout) # print(b.stdout)
installWeb = Pihole.run(''' installWeb = Pihole.run('''
export TERM=xterm export TERM=xterm
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
@ -544,6 +545,38 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}" echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}"
''') ''')
assert 0 == installWeb.rc assert 0 == installWeb.rc
b = Pihole.run('apt-get install e2fsprogs');
print(b.stdout)
b = Pihole.run('dnf install e2fsprogs');
print(b.stdout)
b = Pihole.run('yum install e2fsprogs');
print(b.stdout)
b = Pihole.run('ls -la $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('lsattr $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('lsattr $(which pihole-FTL)/../');
print(b.stdout)
b = Pihole.run('chmod a+x $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('su --shell /bin/bash --command "pihole-FTL version" -p root');
print(b.stdout)
b = Pihole.run('su --shell /bin/bash --command "pihole-FTL tag" -p root');
print(b.stdout)
b = Pihole.run('su --shell /bin/bash --command "pihole-FTL branch" -p root');
print(b.stdout)
b = Pihole.run('su --shell /bin/bash --command "pihole-FTL test" -p root');
print(b.stdout)
b = Pihole.run('ldd $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('LD_DEBUG=help pihole-FTL version');
print(b.stdout)
b = Pihole.run('file pihole-FTL');
print(b.stdout)
b = Pihole.run('cat /var/log/pihole.log');
print(b.stdout)
b = Pihole.run('cat /etc/pihole/install.log');
print(b.stdout)
piholeuser = 'pihole' piholeuser = 'pihole'
webuser = '' webuser = ''
user = re.findall( user = re.findall(