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

add some more details to ouput to debut travis failure 

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2019-02-13 23:14:25 -06:00
parent f9a21d2ff9
commit ca4fe84df2
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bash_functions.sh
View File

@ -120,11 +120,13 @@ setup_dnsmasq_dns() {
if [ ! -f /.piholeFirstBoot ] ; then if [ ! -f /.piholeFirstBoot ] ; then
local setupDNS1="$(grep 'PIHOLE_DNS_1' ${setupVars})" local setupDNS1="$(grep 'PIHOLE_DNS_1' ${setupVars})"
local setupDNS2="$(grep 'PIHOLE_DNS_2' ${setupVars})" local setupDNS2="$(grep 'PIHOLE_DNS_2' ${setupVars})"
setupDNS1="${setupDNS1/PIHOLE_DNS_1=/}"
setupDNS2="${setupDNS2/PIHOLE_DNS_2=/}"
if [[ -n "$DNS1" && -n "$setupDNS1" ]] || \ if [[ -n "$DNS1" && -n "$setupDNS1" ]] || \
[[ -n "$DNS2" && -n "$setupDNS2" ]] ; then [[ -n "$DNS2" && -n "$setupDNS2" ]] ; then
echo "Docker DNS variables not used" echo "Docker DNS variables not used"
fi fi
echo "Existing DNS servers used" echo "Existing DNS servers used (${setupDNS1:-unset} & ${setupDNS2:-unset})"
return return
fi fi

21
test/test_bash_functions.py
View File

@ -76,11 +76,11 @@ def test_override_default_servers_with_DNS_EnvVars(Docker, Slow, args_env, expec
('', '9.9.9.1', '9.9.9.2', ('', '9.9.9.1', '9.9.9.2',
'Existing DNS servers used'), 'Existing DNS servers used'),
('-e DNS1="1.2.3.4"', '9.9.9.1', '9.9.9.2', ('-e DNS1="1.2.3.4"', '9.9.9.1', '9.9.9.2',
'Docker DNS variables not used\nExisting DNS servers used'), 'Docker DNS variables not used\nExisting DNS servers used (9.9.9.1 & 9.9.9.2)'),
('-e DNS2="1.2.3.4"', '8.8.8.8', '1.2.3.4', ('-e DNS2="1.2.3.4"', '8.8.8.8', None,
'Docker DNS variables not used\nExisting DNS servers used'), 'Docker DNS variables not used\nExisting DNS servers used (8.8.8.8 & unset)'),
('-e DNS1="1.2.3.4" -e DNS2="2.2.3.4"', '1.2.3.4', '2.2.3.4', ('-e DNS1="1.2.3.4" -e DNS2="2.2.3.4"', '1.2.3.4', '2.2.3.4',
'Docker DNS variables not used\nExisting DNS servers used'), 'Docker DNS variables not used\nExisting DNS servers used (1.2.3.4 & 2.2.3.4'),
]) ])
def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_stdout, dns1, dns2): def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_stdout, dns1, dns2):
''' on second boot when DNS vars are set just use pihole DNS settings ''' on second boot when DNS vars are set just use pihole DNS settings
@ -93,18 +93,19 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_st
Docker.run('sed -i "/^PIHOLE_DNS_1/ d" {}'.format(dns1, setupVars)) Docker.run('sed -i "/^PIHOLE_DNS_1/ d" {}'.format(dns1, setupVars))
Docker.run('sed -i "/^PIHOLE_DNS_2/ d" {}'.format(dns2, setupVars)) Docker.run('sed -i "/^PIHOLE_DNS_2/ d" {}'.format(dns2, setupVars))
Docker.run('echo "PIHOLE_DNS_1={}" >> {}'.format(dns1, setupVars)) Docker.run('echo "PIHOLE_DNS_1={}" >> {}'.format(dns1, setupVars))
Docker.run('echo "PIHOLE_DNS_2={}" >> {}'.format(dns2, setupVars)) if dns2:
Docker.run('echo "PIHOLE_DNS_2={}" >> {}'.format(dns2, setupVars))
# When we run setup dnsmasq during startup of the container # When we run setup dnsmasq during startup of the container
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
# Then the servers are still what the user had customized if forced dnsmasq is not set # Then the servers are still what the user had customized if forced dnsmasq is not set
expected_servers = ['server={}'.format(dns1), 'server={}'.format(dns2)] expected_servers = ['server={}'.format(dns1)]
Slow(lambda: if dns2:
Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout.strip().split('\n') == \ expected_servers.append('server={}'.format(dns2))
expected_servers Slow(lambda: Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout.strip().split('\n') == \
) expected_servers)
@pytest.mark.parametrize('args_env, expected_stdout, expected_config_line', [ @pytest.mark.parametrize('args_env, expected_stdout, expected_config_line', [