Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-21 17:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

update deploy version to 4.1 and fix broken server test

Browse Source 
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill
2018-12-13 18:33:38 -06:00
parent b39a2ad69a
commit b3beb91b52
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/test_bash_functions.py
View File

@@ -104,9 +104,13 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, args, expected_stdout, dns1
assert expected_stdout in function.stdout
expected_servers = 'server={}\nserver={}\n'.format(dns1, dns2)
servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout
searchDns1 = servers.split('\n')[0]
searchDns2 = servers.split('\n')[1]
servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf')
servers = servers.stdout.strip().split('\n')
expected_count = 2
if len(servers) != expected_count:
assert False, "{} is not {}".format(servers, expected_count)
searchDns1 = servers[0]
searchDns2 = servers[1]
# Then the servers are still what the user had customized if forced dnsmasq is not set
assert 'server={}'.format(dns1) == searchDns1