docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Slow down all the flakey tests to pass 100% 

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2019-02-09 00:09:33 -06:00
parent 7ecf7c6f28
commit 236b2f1ed6
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/test_bash_functions.py
View File

@ -1,5 +1,4 @@
import pytest import pytest
import time
import re import re
@ -9,7 +8,7 @@ import re
('-e "IPv6=False"', False, 'IPv4'), ('-e "IPv6=False"', False, 'IPv4'),
('-e "IPv6=foobar"', False, 'IPv4'), ('-e "IPv6=foobar"', False, 'IPv4'),
]) ])
def test_IPv6_not_True_removes_ipv6(Docker, test_args, expected_ipv6, expected_stdout): def test_IPv6_not_True_removes_ipv6(Docker, Slow, test_args, expected_ipv6, expected_stdout):
''' When a user overrides IPv6=True they only get IPv4 listening webservers ''' ''' When a user overrides IPv6=True they only get IPv4 listening webservers '''
IPV6_LINE = 'use-ipv6.pl' IPV6_LINE = 'use-ipv6.pl'
WEB_CONFIG = '/etc/lighttpd/lighttpd.conf' WEB_CONFIG = '/etc/lighttpd/lighttpd.conf'
@ -18,14 +17,15 @@ def test_IPv6_not_True_removes_ipv6(Docker, test_args, expected_ipv6, expected_s
assert "Using {}".format(expected_stdout) in function.stdout assert "Using {}".format(expected_stdout) in function.stdout
if expected_stdout == 'IPv4': if expected_stdout == 'IPv4':
assert 'IPv6' not in function.stdout assert 'IPv6' not in function.stdout
# weird slow write/sync problem; no sleep == old state of file, sleep == updated/setup state of file # On overlay2(?) docker sometimes writes to disk are slow enough to break some tests...
time.sleep(1) expected_ipv6_check = lambda: (\
config = Docker.run('grep \'use-ipv6.pl\' {}'.format(WEB_CONFIG)).stdout IPV6_LINE in Docker.run('grep \'use-ipv6.pl\' {}'.format(WEB_CONFIG)).stdout
assert (IPV6_LINE in config) == expected_ipv6 ) == expected_ipv6
Slow(expected_ipv6_check)
@pytest.mark.parametrize('test_args', ['-e "WEB_PORT=999"']) @pytest.mark.parametrize('test_args', ['-e "WEB_PORT=999"'])
def test_overrides_default_WEB_PORT(Docker, test_args): def test_overrides_default_WEB_PORT(Docker, Slow, test_args):
''' When a --net=host user sets WEB_PORT to avoid synology's 80 default IPv4 and or IPv6 ports are updated''' ''' When a --net=host user sets WEB_PORT to avoid synology's 80 default IPv4 and or IPv6 ports are updated'''
CONFIG_LINE = 'server.port\s*=\s*999' CONFIG_LINE = 'server.port\s*=\s*999'
WEB_CONFIG = '/etc/lighttpd/lighttpd.conf' WEB_CONFIG = '/etc/lighttpd/lighttpd.conf'
@ -33,8 +33,7 @@ def test_overrides_default_WEB_PORT(Docker, test_args):
function = Docker.run('. /bash_functions.sh ; eval `grep setup_web_port /start.sh`') function = Docker.run('. /bash_functions.sh ; eval `grep setup_web_port /start.sh`')
assert "Custom WEB_PORT set to 999" in function.stdout assert "Custom WEB_PORT set to 999" in function.stdout
assert "INFO: Without proper router DNAT forwarding to 127.0.0.1:999, you may not get any blocked websites on ads" in function.stdout assert "INFO: Without proper router DNAT forwarding to 127.0.0.1:999, you may not get any blocked websites on ads" in function.stdout
config = Docker.run('cat {}'.format(WEB_CONFIG)).stdout Slow(lambda: re.search(CONFIG_LINE, Docker.run('cat {}'.format(WEB_CONFIG)).stdout) != None)
assert re.search(CONFIG_LINE, config) != None
# grep fails to find any of the old address w/o port # grep fails to find any of the old address w/o port
assert Docker.run('grep -rq "://127.0.0.1/" /var/www/html/').rc == 1 assert Docker.run('grep -rq "://127.0.0.1/" /var/www/html/').rc == 1
assert Docker.run('grep -rq "://pi.hole/" /var/www/html/').rc == 1 assert Docker.run('grep -rq "://pi.hole/" /var/www/html/').rc == 1
@ -63,16 +62,14 @@ def test_bad_input_to_WEB_PORT(Docker, test_args, expected_error):
('-e DNS1="1.2.3.4" -e DNS2="no"', 'custom DNS', '1.2.3.4', None ), ('-e DNS1="1.2.3.4" -e DNS2="no"', 'custom DNS', '1.2.3.4', None ),
('-e DNS2="no"', 'custom DNS', '8.8.8.8', None ), ('-e DNS2="no"', 'custom DNS', '8.8.8.8', None ),
]) ])
def test_override_default_servers_with_DNS_EnvVars(Docker, args_env, expected_stdout, dns1, dns2): def test_override_default_servers_with_DNS_EnvVars(Docker, Slow, args_env, expected_stdout, dns1, dns2):
''' on first boot when DNS vars are NOT set explain default google DNS settings are used ''' on first boot when DNS vars are NOT set explain default google DNS settings are used
or when DNS vars are set override the pihole DNS settings ''' or when DNS vars are set override the pihole DNS settings '''
assert Docker.run('test -f /.piholeFirstBoot').rc == 0 assert Docker.run('test -f /.piholeFirstBoot').rc == 0
function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`') function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`')
assert expected_stdout in function.stdout assert expected_stdout in function.stdout
time.sleep(1)
docker_dns_servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout
expected_servers = 'server={}\n'.format(dns1) if dns2 == None else 'server={}\nserver={}\n'.format(dns1, dns2) expected_servers = 'server={}\n'.format(dns1) if dns2 == None else 'server={}\nserver={}\n'.format(dns1, dns2)
assert expected_servers == docker_dns_servers Slow(lambda: expected_servers == Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout)
@pytest.mark.parametrize('args_env, dns1, dns2, expected_stdout', [ @pytest.mark.parametrize('args_env, dns1, dns2, expected_stdout', [
@ -121,13 +118,11 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, args_env, expected_stdout,
('-e INTERFACE="eth0"', 'binding to default interface: eth0', 'interface=eth0' ), ('-e INTERFACE="eth0"', 'binding to default interface: eth0', 'interface=eth0' ),
('-e INTERFACE="br0"', 'binding to custom interface: br0', 'interface=br0'), ('-e INTERFACE="br0"', 'binding to custom interface: br0', 'interface=br0'),
]) ])
def test_DNS_interface_override_defaults(Docker, args_env, expected_stdout, expected_config_line): def test_DNS_interface_override_defaults(Docker, Slow, args_env, expected_stdout, expected_config_line):
''' When INTERFACE environment var is passed in, overwrite dnsmasq interface ''' ''' When INTERFACE environment var is passed in, overwrite dnsmasq interface '''
function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`') function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`')
assert expected_stdout in function.stdout assert expected_stdout in function.stdout
time.sleep(1) Slow(lambda: expected_config_line + '\n' == Docker.run('grep "^interface" /etc/dnsmasq.d/01-pihole.conf').stdout)
docker_dns_interface = Docker.run('grep "^interface" /etc/dnsmasq.d/01-pihole.conf').stdout
assert expected_config_line + '\n' == docker_dns_interface
expected_debian_lines = [ expected_debian_lines = [

6
tox.ini
View File

@ -7,7 +7,7 @@ deps = -rrequirements.txt
# 2 parallel max b/c race condition with docker fixture (I think?) # 2 parallel max b/c race condition with docker fixture (I think?)
commands = docker run --rm --privileged multiarch/qemu-user-static:register --reset commands = docker run --rm --privileged multiarch/qemu-user-static:register --reset
./Dockerfile.py -v --arch amd64 ./Dockerfile.py -v --arch amd64
pytest -vv -n 2 -k amd64 ./test/ pytest -vv -n auto -k amd64 ./test/
./Dockerfile.py -v --arch armhf --arch aarch64 ./Dockerfile.py -v --arch armhf --arch aarch64
pytest -vv -n 2 -k armhf ./test/ pytest -vv -n auto -k armhf ./test/
pytest -vv -n 2 -k aarch64 ./test/ pytest -vv -n auto -k aarch64 ./test/