mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-25 06:10:20 +00:00
make smarter assertions rathe than largestring not in string
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
parent
449b7bf6e4
commit
8ca4c66e3c
2 changed files with 23 additions and 18 deletions
|
@ -1,4 +1,5 @@
|
||||||
from textwrap import dedent
|
from textwrap import dedent
|
||||||
|
import re
|
||||||
from conftest import (
|
from conftest import (
|
||||||
SETUPVARS,
|
SETUPVARS,
|
||||||
tick_box,
|
tick_box,
|
||||||
|
@ -193,12 +194,16 @@ 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
|
||||||
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT'
|
# General call type occurances
|
||||||
assert iptables_line not in firewall_calls
|
assert len(re.findall(r'iptables -S', firewall_calls)) == 1
|
||||||
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT'
|
assert len(re.findall(r'iptables -C', firewall_calls)) == 4
|
||||||
assert iptables_line not in firewall_calls
|
assert len(re.findall(r'iptables -I', firewall_calls)) == 0
|
||||||
iptables_line = 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT'
|
|
||||||
assert iptables_line not in firewall_calls
|
# Specific port call occurances
|
||||||
|
assert len(re.findall(r'tcp --dport 80', firewall_calls)) == 1
|
||||||
|
assert len(re.findall(r'tcp --dport 53', firewall_calls)) == 1
|
||||||
|
assert len(re.findall(r'udp --dport 53', firewall_calls)) == 1
|
||||||
|
assert len(re.findall(r'tcp --dport 4711:4720', firewall_calls)) == 1
|
||||||
|
|
||||||
|
|
||||||
def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
|
def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
|
||||||
|
@ -236,12 +241,16 @@ 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
|
||||||
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT'
|
# General call type occurances
|
||||||
assert iptables_line in firewall_calls
|
assert len(re.findall(r'iptables -S', firewall_calls)) == 1
|
||||||
iptables_line = 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT'
|
assert len(re.findall(r'iptables -C', firewall_calls)) == 4
|
||||||
assert iptables_line in firewall_calls
|
assert len(re.findall(r'iptables -I', firewall_calls)) == 4
|
||||||
iptables_line = 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT'
|
|
||||||
assert iptables_line in firewall_calls
|
# Specific port call occurances
|
||||||
|
assert len(re.findall(r'tcp --dport 80', firewall_calls)) == 2
|
||||||
|
assert len(re.findall(r'tcp --dport 53', firewall_calls)) == 2
|
||||||
|
assert len(re.findall(r'udp --dport 53', firewall_calls)) == 2
|
||||||
|
assert len(re.findall(r'tcp --dport 4711:4720', firewall_calls)) == 2
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_enforcing_default_exit(Pihole):
|
def test_selinux_enforcing_default_exit(Pihole):
|
||||||
|
@ -351,7 +360,7 @@ def test_update_package_cache_success_no_errors(Pihole):
|
||||||
''')
|
''')
|
||||||
expected_stdout = tick_box + ' Update local cache of available packages'
|
expected_stdout = tick_box + ' Update local cache of available packages'
|
||||||
assert expected_stdout in updateCache.stdout
|
assert expected_stdout in updateCache.stdout
|
||||||
assert 'Error: Unable to update package cache.' not in updateCache.stdout
|
assert 'error' not in updateCache.stdout.lower()
|
||||||
|
|
||||||
|
|
||||||
def test_update_package_cache_failure_no_errors(Pihole):
|
def test_update_package_cache_failure_no_errors(Pihole):
|
||||||
|
@ -478,10 +487,7 @@ def test_FTL_download_aarch64_no_errors(Pihole):
|
||||||
''')
|
''')
|
||||||
expected_stdout = tick_box + ' Downloading and Installing FTL'
|
expected_stdout = tick_box + ' Downloading and Installing FTL'
|
||||||
assert expected_stdout in download_binary.stdout
|
assert expected_stdout in download_binary.stdout
|
||||||
error = 'Error: Download of binary from Github failed'
|
assert 'error' not in download_binary.stdout.lower()
|
||||||
assert error not in download_binary.stdout
|
|
||||||
error = 'Error: URL not found'
|
|
||||||
assert error not in download_binary.stdout
|
|
||||||
|
|
||||||
|
|
||||||
def test_FTL_download_unknown_fails_no_errors(Pihole):
|
def test_FTL_download_unknown_fails_no_errors(Pihole):
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
import re
|
|
||||||
from conftest import (
|
from conftest import (
|
||||||
tick_box,
|
tick_box,
|
||||||
info_box,
|
info_box,
|
||||||
|
|
Loading…
Reference in a new issue