From fded8bdcc41ffcea8fc8ceddc6b7be1255bed087 Mon Sep 17 00:00:00 2001 From: Adam Hill Date: Thu, 14 Feb 2019 00:42:05 -0600 Subject: [PATCH] show me your secrets Signed-off-by: Martin Buchleitner --- test/test_bash_functions.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/test_bash_functions.py b/test/test_bash_functions.py index d7e478d..ed3cc3f 100644 --- a/test/test_bash_functions.py +++ b/test/test_bash_functions.py @@ -77,7 +77,7 @@ def test_override_default_servers_with_DNS_EnvVars(Docker, Slow, args_env, expec 'Existing DNS servers used'), ('-e DNS1="1.2.3.4"', '9.9.9.1', '9.9.9.2', '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', '8.8.4.4', + ('-e DNS2="1.2.3.4"', '8.8.8.8', None, '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', 'Docker DNS variables not used\nExisting DNS servers used (1.2.3.4 & 2.2.3.4'), @@ -91,10 +91,11 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_st # and a user already has custom pihole dns variables in setup vars dns_count = 1 setupVars = '/etc/pihole/setupVars.conf' - Docker.run('sed -i "/^PIHOLE_DNS_1/ c\PIHOLE_DNS_1={}" {}'.format(dns1, setupVars)) - Docker.run('sed -i "/^PIHOLE_DNS_2/ c\PIHOLE_DNS_2={}" {}'.format(dns2, setupVars)) - # confirm_setup = 'grep -c "^PIHOLE_DNS_" {}'.format(setupVars) - # Slow(lambda: int(Docker.run(confirm_setup).stdout) == dns_count) + Docker.run('sed -i "/^PIHOLE_DNS/ d" {}'.format(setupVars)) + Docker.run('echo "PIHOLE_DNS_1={}" >> {}'.format(dns1, setupVars)) + if dns2: + Docker.run('echo "PIHOLE_DNS_2={}" >> {}'.format(dns2, setupVars)) + assert Docker.run('cat {}'.format(setupVars)).stdout == 'wut' # When we run setup dnsmasq during startup of the container function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`')