Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 10:28:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

templated dockerfiles building used by tests

Browse Source 
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
This commit is contained in:
diginc
2017-10-02 22:52:02 -05:00
parent db443aa0dc
commit 18997fe9f6
13 changed files with 50 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/test_bash_functions.py
View File

@@ -11,10 +11,10 @@ DEFAULTARGS = '-e ServerIP="127.0.0.1" '
])
def test_IPv6_not_True_removes_ipv6(Docker, tag, args, expected_ipv6, expected_stdout):
''' When a user overrides IPv6=True they only get IPv4 listening webservers '''
IPV6_LINE = { 'alpine': 'listen [::]:80 default_server',
'debian': 'use-ipv6.pl' }
WEB_CONFIG = { 'alpine': '/etc/nginx/nginx.conf',
'debian': '/etc/lighttpd/lighttpd.conf' }
IPV6_LINE = { 'alpine_amd64': 'listen [::]:80 default_server',
'debian_amd64': 'use-ipv6.pl' }
WEB_CONFIG = { 'alpine_amd64': '/etc/nginx/nginx.conf',
'debian_amd64': '/etc/lighttpd/lighttpd.conf' }
function = Docker.run('. /bash_functions.sh ; setup_ipv4_ipv6')
assert "Using {}".format(expected_stdout) in function.stdout
@@ -55,8 +55,8 @@ expected_debian_lines = [
'"PHP_ERROR_LOG" => "/var/log/lighttpd/error.log"'
]
@pytest.mark.parametrize('tag,expected_lines,repeat_function', [
('debian', expected_debian_lines, 1),
('debian', expected_debian_lines, 2)
('debian_amd64', expected_debian_lines, 1),
('debian_amd64', expected_debian_lines, 2)
])
def test_debian_setup_php_env(Docker, tag, expected_lines, repeat_function):
''' confirm all expected output is there and nothing else '''