mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 14:58:08 +00:00
python linting: lines > 79 characters (E501)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
This commit is contained in:
parent
da3dfd0998
commit
c3d443aaff
@ -8,8 +8,10 @@ check_output = testinfra.get_backend(
|
|||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def Pihole(Docker):
|
def Pihole(Docker):
|
||||||
''' used to contain some script stubbing, now pretty much an alias.
|
'''
|
||||||
Also provides bash as the default run function shell '''
|
used to contain some script stubbing, now pretty much an alias.
|
||||||
|
Also provides bash as the default run function shell
|
||||||
|
'''
|
||||||
def run_bash(self, command, *args, **kwargs):
|
def run_bash(self, command, *args, **kwargs):
|
||||||
cmd = self.get_command(command, *args)
|
cmd = self.get_command(command, *args)
|
||||||
if self.user is not None:
|
if self.user is not None:
|
||||||
@ -23,13 +25,18 @@ def Pihole(Docker):
|
|||||||
return out
|
return out
|
||||||
|
|
||||||
funcType = type(Docker.run)
|
funcType = type(Docker.run)
|
||||||
Docker.run = funcType(run_bash, Docker, testinfra.backend.docker.DockerBackend)
|
Docker.run = funcType(run_bash,
|
||||||
|
Docker,
|
||||||
|
testinfra.backend.docker.DockerBackend)
|
||||||
return Docker
|
return Docker
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def Docker(request, args, image, cmd):
|
def Docker(request, args, image, cmd):
|
||||||
''' combine our fixtures into a docker run command and setup finalizer to cleanup '''
|
'''
|
||||||
|
combine our fixtures into a docker run command and setup finalizer to
|
||||||
|
cleanup
|
||||||
|
'''
|
||||||
assert 'docker' in check_output('id'), "Are you in the docker group?"
|
assert 'docker' in check_output('id'), "Are you in the docker group?"
|
||||||
docker_run = "docker run {} {} {}".format(args, image, cmd)
|
docker_run = "docker run {} {} {}".format(args, image, cmd)
|
||||||
docker_id = check_output(docker_run)
|
docker_id = check_output(docker_run)
|
||||||
@ -45,23 +52,31 @@ def Docker(request, args, image, cmd):
|
|||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def args(request):
|
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'
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['debian', 'centos'])
|
@pytest.fixture(params=['debian', 'centos'])
|
||||||
def tag(request):
|
def tag(request):
|
||||||
''' consumed by image to make the test matrix '''
|
'''
|
||||||
|
consumed by image to make the test matrix
|
||||||
|
'''
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def image(request, tag):
|
def image(request, tag):
|
||||||
''' built by test_000_build_containers.py '''
|
'''
|
||||||
|
built by test_000_build_containers.py
|
||||||
|
'''
|
||||||
return 'pytest_pihole:{}'.format(tag)
|
return 'pytest_pihole:{}'.format(tag)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def cmd(request):
|
def cmd(request):
|
||||||
''' default to doing nothing by tailing null, but don't exit '''
|
'''
|
||||||
|
default to doing nothing by tailing null, but don't exit
|
||||||
|
'''
|
||||||
return 'tail -f /dev/null'
|
return 'tail -f /dev/null'
|
||||||
|
@ -15,9 +15,11 @@ info_box="[i]".decode("utf-8")
|
|||||||
|
|
||||||
|
|
||||||
def test_setupVars_are_sourced_to_global_scope(Pihole):
|
def test_setupVars_are_sourced_to_global_scope(Pihole):
|
||||||
''' currently update_dialogs sources setupVars with a dot,
|
'''
|
||||||
|
currently update_dialogs sources setupVars with a dot,
|
||||||
then various other functions use the variables.
|
then various other functions use the variables.
|
||||||
This confirms the sourced variables are in scope between functions '''
|
This confirms the sourced variables are in scope between functions
|
||||||
|
'''
|
||||||
setup_var_file = 'cat <<EOF> /etc/pihole/setupVars.conf\n'
|
setup_var_file = 'cat <<EOF> /etc/pihole/setupVars.conf\n'
|
||||||
for k,v in SETUPVARS.iteritems():
|
for k,v in SETUPVARS.iteritems():
|
||||||
setup_var_file += "{}={}\n".format(k, v)
|
setup_var_file += "{}={}\n".format(k, v)
|
||||||
@ -49,8 +51,11 @@ def test_setupVars_are_sourced_to_global_scope(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_setupVars_saved_to_file(Pihole):
|
def test_setupVars_saved_to_file(Pihole):
|
||||||
''' confirm saved settings are written to a file for future updates to re-use '''
|
'''
|
||||||
set_setup_vars = '\n' # dedent works better with this and padding matching script below
|
confirm saved settings are written to a file for future updates to re-use
|
||||||
|
'''
|
||||||
|
# dedent works better with this and padding matching script below
|
||||||
|
set_setup_vars = '\n'
|
||||||
for k,v in SETUPVARS.iteritems():
|
for k,v in SETUPVARS.iteritems():
|
||||||
set_setup_vars += " {}={}\n".format(k, v)
|
set_setup_vars += " {}={}\n".format(k, v)
|
||||||
Pihole.run(set_setup_vars).stdout
|
Pihole.run(set_setup_vars).stdout
|
||||||
@ -74,7 +79,9 @@ def test_setupVars_saved_to_file(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_firewalld_running_no_errors(Pihole):
|
def test_configureFirewall_firewalld_running_no_errors(Pihole):
|
||||||
''' confirms firewalld rules are applied when firewallD is running '''
|
'''
|
||||||
|
confirms firewalld rules are applied when firewallD is running
|
||||||
|
'''
|
||||||
# firewallD returns 'running' as status
|
# firewallD returns 'running' as status
|
||||||
mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
|
mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
|
||||||
# Whiptail dialog returns Ok for user prompt
|
# Whiptail dialog returns Ok for user prompt
|
||||||
@ -87,24 +94,33 @@ def test_configureFirewall_firewalld_running_no_errors(Pihole):
|
|||||||
assert expected_stdout in configureFirewall.stdout
|
assert expected_stdout in configureFirewall.stdout
|
||||||
firewall_calls = Pihole.run('cat /var/log/firewall-cmd').stdout
|
firewall_calls = Pihole.run('cat /var/log/firewall-cmd').stdout
|
||||||
assert 'firewall-cmd --state' in firewall_calls
|
assert 'firewall-cmd --state' in firewall_calls
|
||||||
assert 'firewall-cmd --permanent --add-service=http --add-service=dns' in firewall_calls
|
assert ('firewall-cmd '
|
||||||
|
'--permanent '
|
||||||
|
'--add-service=http '
|
||||||
|
'--add-service=dns') in firewall_calls
|
||||||
assert 'firewall-cmd --reload' in firewall_calls
|
assert 'firewall-cmd --reload' in firewall_calls
|
||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_firewalld_disabled_no_errors(Pihole):
|
def test_configureFirewall_firewalld_disabled_no_errors(Pihole):
|
||||||
''' confirms firewalld rules are not applied when firewallD is not running '''
|
'''
|
||||||
|
confirms firewalld rules are not applied when firewallD is not running
|
||||||
|
'''
|
||||||
# firewallD returns non-running status
|
# firewallD returns non-running status
|
||||||
mock_command('firewall-cmd', {'*': ('not running', '1')}, Pihole)
|
mock_command('firewall-cmd', {'*': ('not running', '1')}, Pihole)
|
||||||
configureFirewall = Pihole.run('''
|
configureFirewall = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
configureFirewall
|
configureFirewall
|
||||||
''')
|
''')
|
||||||
expected_stdout = 'No active firewall detected.. skipping firewall configuration'
|
expected_stdout = ('No active firewall detected.. '
|
||||||
|
'skipping firewall configuration')
|
||||||
assert expected_stdout in configureFirewall.stdout
|
assert expected_stdout in configureFirewall.stdout
|
||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_firewalld_enabled_declined_no_errors(Pihole):
|
def test_configureFirewall_firewalld_enabled_declined_no_errors(Pihole):
|
||||||
''' confirms firewalld rules are not applied when firewallD is running, user declines ruleset '''
|
'''
|
||||||
|
confirms firewalld rules are not applied when firewallD is running, user
|
||||||
|
declines ruleset
|
||||||
|
'''
|
||||||
# firewallD returns running status
|
# firewallD returns running status
|
||||||
mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
|
mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
|
||||||
# Whiptail dialog returns Cancel for user prompt
|
# Whiptail dialog returns Cancel for user prompt
|
||||||
@ -128,7 +144,10 @@ def test_configureFirewall_no_firewall(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
|
def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
|
||||||
''' confirms IPTables rules are not applied when IPTables is running, user declines ruleset '''
|
'''
|
||||||
|
confirms IPTables rules are not applied when IPTables is running, user
|
||||||
|
declines ruleset
|
||||||
|
'''
|
||||||
# iptables command exists
|
# iptables command exists
|
||||||
mock_command('iptables', {'*': ('', '0')}, Pihole)
|
mock_command('iptables', {'*': ('', '0')}, Pihole)
|
||||||
# modinfo returns always true (ip_tables module check)
|
# modinfo returns always true (ip_tables module check)
|
||||||
@ -144,8 +163,12 @@ def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
|
def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
|
||||||
''' confirms IPTables rules are not applied when IPTables is running and rules exist '''
|
'''
|
||||||
# iptables command exists and returns 0 on calls (should return 0 on iptables -C)
|
confirms IPTables rules are not applied when IPTables is running and rules
|
||||||
|
exist
|
||||||
|
'''
|
||||||
|
# iptables command exists and returns 0 on calls
|
||||||
|
# (should return 0 on iptables -C)
|
||||||
mock_command('iptables', {'-S': ('-P INPUT DENY', '0')}, Pihole)
|
mock_command('iptables', {'-S': ('-P INPUT DENY', '0')}, Pihole)
|
||||||
# modinfo returns always true (ip_tables module check)
|
# modinfo returns always true (ip_tables module check)
|
||||||
mock_command('modinfo', {'*': ('', '0')}, Pihole)
|
mock_command('modinfo', {'*': ('', '0')}, Pihole)
|
||||||
@ -158,15 +181,38 @@ def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
|
|||||||
expected_stdout = 'Installing new IPTables firewall rulesets'
|
expected_stdout = 'Installing new IPTables firewall rulesets'
|
||||||
assert expected_stdout in configureFirewall.stdout
|
assert expected_stdout in configureFirewall.stdout
|
||||||
firewall_calls = Pihole.run('cat /var/log/iptables').stdout
|
firewall_calls = Pihole.run('cat /var/log/iptables').stdout
|
||||||
assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' not in firewall_calls
|
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT'
|
||||||
assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' not in firewall_calls
|
assert iptables_line not in firewall_calls
|
||||||
assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' not in firewall_calls
|
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT'
|
||||||
|
assert iptables_line not in firewall_calls
|
||||||
|
iptables_line = 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT'
|
||||||
|
assert iptables_line not in firewall_calls
|
||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
|
def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
|
||||||
''' confirms IPTables rules are applied when IPTables is running and rules do not exist '''
|
'''
|
||||||
|
confirms IPTables rules are applied when IPTables is running and rules do
|
||||||
|
not exist
|
||||||
|
'''
|
||||||
# iptables command and returns 0 on calls (should return 1 on iptables -C)
|
# iptables command and returns 0 on calls (should return 1 on iptables -C)
|
||||||
mock_command('iptables', {'-S': ('-P INPUT DENY', '0'), '-C': ('', 1), '-I': ('', 0)}, Pihole)
|
mock_command(
|
||||||
|
'iptables',
|
||||||
|
{
|
||||||
|
'-S': (
|
||||||
|
'-P INPUT DENY',
|
||||||
|
'0'
|
||||||
|
),
|
||||||
|
'-C': (
|
||||||
|
'',
|
||||||
|
1
|
||||||
|
),
|
||||||
|
'-I': (
|
||||||
|
'',
|
||||||
|
0
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
# modinfo returns always true (ip_tables module check)
|
# modinfo returns always true (ip_tables module check)
|
||||||
mock_command('modinfo', {'*': ('', '0')}, Pihole)
|
mock_command('modinfo', {'*': ('', '0')}, Pihole)
|
||||||
# Whiptail dialog returns Cancel for user prompt
|
# Whiptail dialog returns Cancel for user prompt
|
||||||
@ -178,13 +224,18 @@ def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
|
|||||||
expected_stdout = 'Installing new IPTables firewall rulesets'
|
expected_stdout = 'Installing new IPTables firewall rulesets'
|
||||||
assert expected_stdout in configureFirewall.stdout
|
assert expected_stdout in configureFirewall.stdout
|
||||||
firewall_calls = Pihole.run('cat /var/log/iptables').stdout
|
firewall_calls = Pihole.run('cat /var/log/iptables').stdout
|
||||||
assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' in firewall_calls
|
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT'
|
||||||
assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' in firewall_calls
|
assert iptables_line in firewall_calls
|
||||||
assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' in firewall_calls
|
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT'
|
||||||
|
assert iptables_line in firewall_calls
|
||||||
|
iptables_line = 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT'
|
||||||
|
assert iptables_line in firewall_calls
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_enforcing_default_exit(Pihole):
|
def test_selinux_enforcing_default_exit(Pihole):
|
||||||
''' confirms installer prompts to exit when SELinux is Enforcing by default '''
|
'''
|
||||||
|
confirms installer prompts to exit when SELinux is Enforcing by default
|
||||||
|
'''
|
||||||
# getenforce returns the running state of SELinux
|
# getenforce returns the running state of SELinux
|
||||||
mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
|
mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
|
||||||
# Whiptail dialog returns Cancel for user prompt
|
# Whiptail dialog returns Cancel for user prompt
|
||||||
@ -193,13 +244,17 @@ def test_selinux_enforcing_default_exit(Pihole):
|
|||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
checkSelinux
|
checkSelinux
|
||||||
''')
|
''')
|
||||||
assert info_box + ' SELinux mode detected: Enforcing' in check_selinux.stdout
|
expected_stdout = info_box + ' SELinux mode detected: Enforcing'
|
||||||
assert 'SELinux Enforcing detected, exiting installer' in check_selinux.stdout
|
assert expected_stdout in check_selinux.stdout
|
||||||
|
expected_stdout = 'SELinux Enforcing detected, exiting installer'
|
||||||
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert check_selinux.rc == 1
|
assert check_selinux.rc == 1
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_enforcing_continue(Pihole):
|
def test_selinux_enforcing_continue(Pihole):
|
||||||
''' confirms installer prompts to continue with custom policy warning '''
|
'''
|
||||||
|
confirms installer prompts to continue with custom policy warning
|
||||||
|
'''
|
||||||
# getenforce returns the running state of SELinux
|
# getenforce returns the running state of SELinux
|
||||||
mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
|
mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
|
||||||
# Whiptail dialog returns Cancel for user prompt
|
# Whiptail dialog returns Cancel for user prompt
|
||||||
@ -208,80 +263,117 @@ def test_selinux_enforcing_continue(Pihole):
|
|||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
checkSelinux
|
checkSelinux
|
||||||
''')
|
''')
|
||||||
assert info_box + ' SELinux mode detected: Enforcing' in check_selinux.stdout
|
expected_stdout = info_box + ' SELinux mode detected: Enforcing'
|
||||||
assert info_box + ' Continuing installation with SELinux Enforcing' in check_selinux.stdout
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert info_box + ' Please refer to official SELinux documentation to create a custom policy' in check_selinux.stdout
|
expected_stdout = info_box + (' Continuing installation with SELinux '
|
||||||
|
'Enforcing')
|
||||||
|
assert expected_stdout in check_selinux.stdout
|
||||||
|
expected_stdout = info_box + (' Please refer to official SELinux '
|
||||||
|
'documentation to create a custom policy')
|
||||||
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert check_selinux.rc == 0
|
assert check_selinux.rc == 0
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_permissive(Pihole):
|
def test_selinux_permissive(Pihole):
|
||||||
''' confirms installer continues when SELinux is Permissive '''
|
'''
|
||||||
|
confirms installer continues when SELinux is Permissive
|
||||||
|
'''
|
||||||
# getenforce returns the running state of SELinux
|
# getenforce returns the running state of SELinux
|
||||||
mock_command('getenforce', {'*': ('Permissive', '0')}, Pihole)
|
mock_command('getenforce', {'*': ('Permissive', '0')}, Pihole)
|
||||||
check_selinux = Pihole.run('''
|
check_selinux = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
checkSelinux
|
checkSelinux
|
||||||
''')
|
''')
|
||||||
assert info_box + ' SELinux mode detected: Permissive' in check_selinux.stdout
|
expected_stdout = info_box + ' SELinux mode detected: Permissive'
|
||||||
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert check_selinux.rc == 0
|
assert check_selinux.rc == 0
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_disabled(Pihole):
|
def test_selinux_disabled(Pihole):
|
||||||
''' confirms installer continues when SELinux is Disabled '''
|
'''
|
||||||
|
confirms installer continues when SELinux is Disabled
|
||||||
|
'''
|
||||||
mock_command('getenforce', {'*': ('Disabled', '0')}, Pihole)
|
mock_command('getenforce', {'*': ('Disabled', '0')}, Pihole)
|
||||||
check_selinux = Pihole.run('''
|
check_selinux = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
checkSelinux
|
checkSelinux
|
||||||
''')
|
''')
|
||||||
assert info_box + ' SELinux mode detected: Disabled' in check_selinux.stdout
|
expected_stdout = info_box + ' SELinux mode detected: Disabled'
|
||||||
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert check_selinux.rc == 0
|
assert check_selinux.rc == 0
|
||||||
|
|
||||||
|
|
||||||
def test_installPiholeWeb_fresh_install_no_errors(Pihole):
|
def test_installPiholeWeb_fresh_install_no_errors(Pihole):
|
||||||
''' confirms all web page assets from Core repo are installed on a fresh build '''
|
'''
|
||||||
|
confirms all web page assets from Core repo are installed on a fresh build
|
||||||
|
'''
|
||||||
installWeb = Pihole.run('''
|
installWeb = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
installPiholeWeb
|
installPiholeWeb
|
||||||
''')
|
''')
|
||||||
assert info_box + ' Installing blocking page...' in installWeb.stdout
|
expected_stdout = info_box + ' Installing blocking page...'
|
||||||
assert tick_box + ' Creating directory for blocking page, and copying files' in installWeb.stdout
|
assert expected_stdout in installWeb.stdout
|
||||||
assert cross_box + ' Backing up index.lighttpd.html' in installWeb.stdout
|
expected_stdout = tick_box + (' Creating directory for blocking page, '
|
||||||
assert 'No default index.lighttpd.html file found... not backing up' in installWeb.stdout
|
'and copying files')
|
||||||
assert tick_box + ' Installing sudoer file' in installWeb.stdout
|
assert expected_stdout in installWeb.stdout
|
||||||
|
expected_stdout = cross_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
|
||||||
web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
|
web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
|
||||||
assert 'index.php' in web_directory
|
assert 'index.php' in web_directory
|
||||||
assert 'blockingpage.css' in web_directory
|
assert 'blockingpage.css' in web_directory
|
||||||
|
|
||||||
|
|
||||||
def test_update_package_cache_success_no_errors(Pihole):
|
def test_update_package_cache_success_no_errors(Pihole):
|
||||||
''' confirms package cache was updated without any errors'''
|
'''
|
||||||
|
confirms package cache was updated without any errors
|
||||||
|
'''
|
||||||
updateCache = Pihole.run('''
|
updateCache = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
distro_check
|
distro_check
|
||||||
update_package_cache
|
update_package_cache
|
||||||
''')
|
''')
|
||||||
assert tick_box + ' Update local cache of available packages' in updateCache.stdout
|
expected_stdout = tick_box + ' Update local cache of available packages'
|
||||||
|
assert expected_stdout in updateCache.stdout
|
||||||
assert 'Error: Unable to update package cache.' not in updateCache.stdout
|
assert 'Error: Unable to update package cache.' not in updateCache.stdout
|
||||||
|
|
||||||
|
|
||||||
def test_update_package_cache_failure_no_errors(Pihole):
|
def test_update_package_cache_failure_no_errors(Pihole):
|
||||||
''' confirms package cache was not updated'''
|
'''
|
||||||
|
confirms package cache was not updated
|
||||||
|
'''
|
||||||
mock_command('apt-get', {'update': ('', '1')}, Pihole)
|
mock_command('apt-get', {'update': ('', '1')}, Pihole)
|
||||||
updateCache = Pihole.run('''
|
updateCache = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
distro_check
|
distro_check
|
||||||
update_package_cache
|
update_package_cache
|
||||||
''')
|
''')
|
||||||
assert cross_box + ' Update local cache of available packages' in updateCache.stdout
|
expected_stdout = cross_box + ' Update local cache of available packages'
|
||||||
|
assert expected_stdout in updateCache.stdout
|
||||||
assert 'Error: Unable to update package cache.' in updateCache.stdout
|
assert 'Error: Unable to update package cache.' in updateCache.stdout
|
||||||
|
|
||||||
|
|
||||||
def test_FTL_detect_aarch64_no_errors(Pihole):
|
def test_FTL_detect_aarch64_no_errors(Pihole):
|
||||||
''' confirms only aarch64 package is downloaded for FTL engine '''
|
'''
|
||||||
|
confirms only aarch64 package is downloaded for FTL engine
|
||||||
|
'''
|
||||||
# mock uname to return aarch64 platform
|
# mock uname to return aarch64 platform
|
||||||
mock_command('uname', {'-m': ('aarch64', '0')}, Pihole)
|
mock_command('uname', {'-m': ('aarch64', '0')}, Pihole)
|
||||||
# mock ldd to respond with aarch64 shared library
|
# mock ldd to respond with aarch64 shared library
|
||||||
mock_command('ldd', {'/bin/ls': ('/lib/ld-linux-aarch64.so.1', '0')}, Pihole)
|
mock_command(
|
||||||
|
'ldd',
|
||||||
|
{
|
||||||
|
'/bin/ls': (
|
||||||
|
'/lib/ld-linux-aarch64.so.1',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
FTLdetect
|
FTLdetect
|
||||||
@ -295,7 +387,9 @@ def test_FTL_detect_aarch64_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_FTL_detect_armv6l_no_errors(Pihole):
|
def test_FTL_detect_armv6l_no_errors(Pihole):
|
||||||
''' confirms only armv6l package is downloaded for FTL engine '''
|
'''
|
||||||
|
confirms only armv6l package is downloaded for FTL engine
|
||||||
|
'''
|
||||||
# mock uname to return armv6l platform
|
# mock uname to return armv6l platform
|
||||||
mock_command('uname', {'-m': ('armv6l', '0')}, Pihole)
|
mock_command('uname', {'-m': ('armv6l', '0')}, Pihole)
|
||||||
# mock ldd to respond with aarch64 shared library
|
# mock ldd to respond with aarch64 shared library
|
||||||
@ -306,14 +400,17 @@ def test_FTL_detect_armv6l_no_errors(Pihole):
|
|||||||
''')
|
''')
|
||||||
expected_stdout = info_box + ' FTL Checks...'
|
expected_stdout = info_box + ' FTL Checks...'
|
||||||
assert expected_stdout in detectPlatform.stdout
|
assert expected_stdout in detectPlatform.stdout
|
||||||
expected_stdout = tick_box + ' Detected ARM-hf architecture (armv6 or lower)'
|
expected_stdout = tick_box + (' Detected ARM-hf architecture '
|
||||||
|
'(armv6 or lower)')
|
||||||
assert expected_stdout in detectPlatform.stdout
|
assert expected_stdout in detectPlatform.stdout
|
||||||
expected_stdout = tick_box + ' Downloading and Installing FTL'
|
expected_stdout = tick_box + ' Downloading and Installing FTL'
|
||||||
assert expected_stdout in detectPlatform.stdout
|
assert expected_stdout in detectPlatform.stdout
|
||||||
|
|
||||||
|
|
||||||
def test_FTL_detect_armv7l_no_errors(Pihole):
|
def test_FTL_detect_armv7l_no_errors(Pihole):
|
||||||
''' confirms only armv7l package is downloaded for FTL engine '''
|
'''
|
||||||
|
confirms only armv7l package is downloaded for FTL engine
|
||||||
|
'''
|
||||||
# mock uname to return armv7l platform
|
# mock uname to return armv7l platform
|
||||||
mock_command('uname', {'-m': ('armv7l', '0')}, Pihole)
|
mock_command('uname', {'-m': ('armv7l', '0')}, Pihole)
|
||||||
# mock ldd to respond with aarch64 shared library
|
# mock ldd to respond with aarch64 shared library
|
||||||
@ -331,7 +428,9 @@ def test_FTL_detect_armv7l_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_FTL_detect_x86_64_no_errors(Pihole):
|
def test_FTL_detect_x86_64_no_errors(Pihole):
|
||||||
''' confirms only x86_64 package is downloaded for FTL engine '''
|
'''
|
||||||
|
confirms only x86_64 package is downloaded for FTL engine
|
||||||
|
'''
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
FTLdetect
|
FTLdetect
|
||||||
@ -357,7 +456,9 @@ def test_FTL_detect_unknown_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_FTL_download_aarch64_no_errors(Pihole):
|
def test_FTL_download_aarch64_no_errors(Pihole):
|
||||||
''' confirms only aarch64 package is downloaded for FTL engine '''
|
'''
|
||||||
|
confirms only aarch64 package is downloaded for FTL engine
|
||||||
|
'''
|
||||||
# mock uname to return generic platform
|
# mock uname to return generic platform
|
||||||
download_binary = Pihole.run('''
|
download_binary = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
@ -372,7 +473,9 @@ def test_FTL_download_aarch64_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_FTL_download_unknown_fails_no_errors(Pihole):
|
def test_FTL_download_unknown_fails_no_errors(Pihole):
|
||||||
''' confirms unknown binary is not downloaded for FTL engine '''
|
'''
|
||||||
|
confirms unknown binary is not downloaded for FTL engine
|
||||||
|
'''
|
||||||
# mock uname to return generic platform
|
# mock uname to return generic platform
|
||||||
download_binary = Pihole.run('''
|
download_binary = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
@ -385,7 +488,9 @@ def test_FTL_download_unknown_fails_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
|
def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
|
||||||
''' confirms FTL binary is copied and functional in installed location '''
|
'''
|
||||||
|
confirms FTL binary is copied and functional in installed location
|
||||||
|
'''
|
||||||
installed_binary = Pihole.run('''
|
installed_binary = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
FTLdetect
|
FTLdetect
|
||||||
@ -396,7 +501,9 @@ def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
# def test_FTL_support_files_installed(Pihole):
|
# def test_FTL_support_files_installed(Pihole):
|
||||||
# ''' confirms FTL support files are installed '''
|
# '''
|
||||||
|
# confirms FTL support files are installed
|
||||||
|
# '''
|
||||||
# support_files = Pihole.run('''
|
# support_files = Pihole.run('''
|
||||||
# source /opt/pihole/basic-install.sh
|
# source /opt/pihole/basic-install.sh
|
||||||
# FTLdetect
|
# FTLdetect
|
||||||
@ -411,21 +518,44 @@ def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_IPv6_only_link_local(Pihole):
|
def test_IPv6_only_link_local(Pihole):
|
||||||
''' confirms IPv6 blocking is disabled for Link-local address '''
|
'''
|
||||||
|
confirms IPv6 blocking is disabled for Link-local address
|
||||||
|
'''
|
||||||
# mock ip -6 address to return Link-local address
|
# mock ip -6 address to return Link-local address
|
||||||
mock_command_2('ip', {'-6 address': ('inet6 fe80::d210:52fa:fe00:7ad7/64 scope link', '0')}, Pihole)
|
mock_command_2(
|
||||||
|
'ip',
|
||||||
|
{
|
||||||
|
'-6 address': (
|
||||||
|
'inet6 fe80::d210:52fa:fe00:7ad7/64 scope link',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
useIPv6dialog
|
useIPv6dialog
|
||||||
''')
|
''')
|
||||||
expected_stdout = 'Unable to find IPv6 ULA/GUA address, IPv6 adblocking will not be enabled'
|
expected_stdout = ('Unable to find IPv6 ULA/GUA address, '
|
||||||
|
'IPv6 adblocking will not be enabled')
|
||||||
assert expected_stdout in detectPlatform.stdout
|
assert expected_stdout in detectPlatform.stdout
|
||||||
|
|
||||||
|
|
||||||
def test_IPv6_only_ULA(Pihole):
|
def test_IPv6_only_ULA(Pihole):
|
||||||
''' confirms IPv6 blocking is enabled for ULA addresses '''
|
'''
|
||||||
|
confirms IPv6 blocking is enabled for ULA addresses
|
||||||
|
'''
|
||||||
# mock ip -6 address to return ULA address
|
# mock ip -6 address to return ULA address
|
||||||
mock_command_2('ip', {'-6 address': ('inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
|
mock_command_2(
|
||||||
|
'ip',
|
||||||
|
{
|
||||||
|
'-6 address': (
|
||||||
|
'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
useIPv6dialog
|
useIPv6dialog
|
||||||
@ -435,9 +565,20 @@ def test_IPv6_only_ULA(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_IPv6_only_GUA(Pihole):
|
def test_IPv6_only_GUA(Pihole):
|
||||||
''' confirms IPv6 blocking is enabled for GUA addresses '''
|
'''
|
||||||
|
confirms IPv6 blocking is enabled for GUA addresses
|
||||||
|
'''
|
||||||
# mock ip -6 address to return GUA address
|
# mock ip -6 address to return GUA address
|
||||||
mock_command_2('ip', {'-6 address': ('inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
|
mock_command_2(
|
||||||
|
'ip',
|
||||||
|
{
|
||||||
|
'-6 address': (
|
||||||
|
'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
useIPv6dialog
|
useIPv6dialog
|
||||||
@ -447,9 +588,21 @@ def test_IPv6_only_GUA(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_IPv6_GUA_ULA_test(Pihole):
|
def test_IPv6_GUA_ULA_test(Pihole):
|
||||||
''' confirms IPv6 blocking is enabled for GUA and ULA addresses '''
|
'''
|
||||||
|
confirms IPv6 blocking is enabled for GUA and ULA addresses
|
||||||
|
'''
|
||||||
# mock ip -6 address to return GUA and ULA addresses
|
# mock ip -6 address to return GUA and ULA addresses
|
||||||
mock_command_2('ip', {'-6 address': ('inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global\ninet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
|
mock_command_2(
|
||||||
|
'ip',
|
||||||
|
{
|
||||||
|
'-6 address': (
|
||||||
|
'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global\n'
|
||||||
|
'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
useIPv6dialog
|
useIPv6dialog
|
||||||
@ -459,9 +612,21 @@ def test_IPv6_GUA_ULA_test(Pihole):
|
|||||||
|
|
||||||
|
|
||||||
def test_IPv6_ULA_GUA_test(Pihole):
|
def test_IPv6_ULA_GUA_test(Pihole):
|
||||||
''' confirms IPv6 blocking is enabled for GUA and ULA addresses '''
|
'''
|
||||||
|
confirms IPv6 blocking is enabled for GUA and ULA addresses
|
||||||
|
'''
|
||||||
# mock ip -6 address to return ULA and GUA addresses
|
# mock ip -6 address to return ULA and GUA addresses
|
||||||
mock_command_2('ip', {'-6 address': ('inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global\ninet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
|
mock_command_2(
|
||||||
|
'ip',
|
||||||
|
{
|
||||||
|
'-6 address': (
|
||||||
|
'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global\n'
|
||||||
|
'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global',
|
||||||
|
'0'
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Pihole
|
||||||
|
)
|
||||||
detectPlatform = Pihole.run('''
|
detectPlatform = Pihole.run('''
|
||||||
source /opt/pihole/basic-install.sh
|
source /opt/pihole/basic-install.sh
|
||||||
useIPv6dialog
|
useIPv6dialog
|
||||||
@ -472,7 +637,10 @@ def test_IPv6_ULA_GUA_test(Pihole):
|
|||||||
|
|
||||||
# Helper functions
|
# Helper functions
|
||||||
def mock_command(script, args, container):
|
def mock_command(script, args, container):
|
||||||
''' Allows for setup of commands we don't really want to have to run for real in unit tests '''
|
'''
|
||||||
|
Allows for setup of commands we don't really want to have to run for real
|
||||||
|
in unit tests
|
||||||
|
'''
|
||||||
full_script_path = '/usr/local/bin/{}'.format(script)
|
full_script_path = '/usr/local/bin/{}'.format(script)
|
||||||
mock_script = dedent('''\
|
mock_script = dedent('''\
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
@ -490,11 +658,16 @@ def mock_command(script, args, container):
|
|||||||
container.run('''
|
container.run('''
|
||||||
cat <<EOF> {script}\n{content}\nEOF
|
cat <<EOF> {script}\n{content}\nEOF
|
||||||
chmod +x {script}
|
chmod +x {script}
|
||||||
rm -f /var/log/{scriptlog}'''.format(script=full_script_path, content=mock_script, scriptlog=script))
|
rm -f /var/log/{scriptlog}'''.format(script=full_script_path,
|
||||||
|
content=mock_script,
|
||||||
|
scriptlog=script))
|
||||||
|
|
||||||
|
|
||||||
def mock_command_2(script, args, container):
|
def mock_command_2(script, args, container):
|
||||||
''' Allows for setup of commands we don't really want to have to run for real in unit tests '''
|
'''
|
||||||
|
Allows for setup of commands we don't really want to have to run for real
|
||||||
|
in unit tests
|
||||||
|
'''
|
||||||
full_script_path = '/usr/local/bin/{}'.format(script)
|
full_script_path = '/usr/local/bin/{}'.format(script)
|
||||||
mock_script = dedent('''\
|
mock_script = dedent('''\
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
@ -512,7 +685,9 @@ def mock_command_2(script, args, container):
|
|||||||
container.run('''
|
container.run('''
|
||||||
cat <<EOF> {script}\n{content}\nEOF
|
cat <<EOF> {script}\n{content}\nEOF
|
||||||
chmod +x {script}
|
chmod +x {script}
|
||||||
rm -f /var/log/{scriptlog}'''.format(script=full_script_path, content=mock_script, scriptlog=script))
|
rm -f /var/log/{scriptlog}'''.format(script=full_script_path,
|
||||||
|
content=mock_script,
|
||||||
|
scriptlog=script))
|
||||||
|
|
||||||
|
|
||||||
def run_script(Pihole, script):
|
def run_script(Pihole, script):
|
||||||
|
@ -7,8 +7,13 @@ run_local = testinfra.get_backend(
|
|||||||
|
|
||||||
|
|
||||||
def test_scripts_pass_shellcheck():
|
def test_scripts_pass_shellcheck():
|
||||||
''' Make sure shellcheck does not find anything wrong with our shell scripts '''
|
'''
|
||||||
shellcheck = "find . -type f -name 'update.sh' | while read file; do shellcheck -x \"$file\" -e SC1090,SC1091; done;"
|
Make sure shellcheck does not find anything wrong with our shell scripts
|
||||||
|
'''
|
||||||
|
shellcheck = ("find . -type f -name 'update.sh' "
|
||||||
|
"| while read file; do "
|
||||||
|
"shellcheck -x \"$file\" -e SC1090,SC1091; "
|
||||||
|
"done;")
|
||||||
results = run_local(shellcheck)
|
results = run_local(shellcheck)
|
||||||
print results.stdout
|
print results.stdout
|
||||||
assert '' == results.stdout
|
assert '' == results.stdout
|
||||||
|
Loading…
Reference in New Issue
Block a user