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

missed test update 

Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
This commit is contained in:
Martin Buchleitner 2019-05-08 08:31:42 +02:00
parent c1fb17a645
commit f950671a1c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bash_functions.sh
View File

@ -116,7 +116,6 @@ setup_dnsmasq_dns() {
dnsType='custom' dnsType='custom'
fi; fi;
# TODO With the addition of this to /start.sh this needs a refactor
if [ ! -f $CONFIG_DIR/.piholeFirstBoot ] ; then if [ ! -f $CONFIG_DIR/.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})"

4
test/test_bash_functions.py
View File

@ -66,7 +66,7 @@ def test_bad_input_to_WEB_PORT(Docker, test_args, expected_error):
def test_override_default_servers_with_DNS_EnvVars(Docker, Slow, 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 $CONFIG_DIR/.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
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)
@ -90,7 +90,7 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_st
''' 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
or when DNS vars and FORCE_DNS var are set override the pihole DNS settings ''' or when DNS vars and FORCE_DNS var are set override the pihole DNS settings '''
# Given we are not booting for the first time # Given we are not booting for the first time
assert Docker.run('rm /.piholeFirstBoot').rc == 0 assert Docker.run('rm $CONFIG_DIR/.piholeFirstBoot').rc == 0
# and a user already has custom pihole dns variables in setup vars # and a user already has custom pihole dns variables in setup vars
dns_count = 1 dns_count = 1