Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix moved incorrect blocks.

Browse source
This commit is contained in:
Dan Schaper 2017-01-23 18:21:50 -08:00
parent 28bafe7427
commit 3aeb378b56
No known key found for this signature in database
GPG key ID: 572E999E385B7BFC
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/test_automated_install.py
View file

@ -64,7 +64,7 @@ def test_setupVars_saved_to_file(Pihole):
for k,v in SETUPVARS.iteritems():
assert "{}={}".format(k, v) in output
def test_configureFirewall_firewalld_running_no_errors(Pihole):
def test_configureFirewall_firewalld_no_errors(Pihole):
''' confirms firewalld rules are applied when appropriate '''
mock_command('firewall-cmd', 'running', '0', Pihole)
configureFirewall = Pihole.run('''
@ -83,18 +83,17 @@ def test_configureFirewall_firewalld_running_no_errors(Pihole):
def mock_command(script, result, retVal, container):
''' Allows for setup of commands we don't really want to have to run for real in unit tests '''
''' TODO: support array of results that enable the results to change over multiple executions of a command '''
container.run('''
cat <<EOF> {script}\n{content}\nEOF
echo {result}
chmod +x {script}
'''.format(script=full_script_path, content=mock_script, result=result))
full_script_path = '/usr/local/bin/{}'.format(script)
mock_script = dedent('''\
#!/bin/bash -e
echo "\$0 \$@" >> /var/log/{script}
echo {result}
exit {retcode}
'''.format(script=script, retcode=retVal))
'''.format(script=script, result=result,retcode=retVal))
container.run('''
cat <<EOF> {script}\n{content}\nEOF
chmod +x {script}
'''.format(script=full_script_path, content=mock_script))
def run_script(Pihole, script):
result = Pihole.run(script)