From 3877a171da64bb2b61b5007f46ac3a7f8f04a248 Mon Sep 17 00:00:00 2001 From: diginc Date: Wed, 4 Jul 2018 14:11:18 -0500 Subject: [PATCH] fix startup 53 port conflict and test error --- bash_functions.sh | 4 ++-- s6/debian-root/etc/cont-init.d/20-start.sh | 3 +-- test/test_bash_functions.py | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bash_functions.sh b/bash_functions.sh index 9ecdd3e..710ae42 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -226,8 +226,8 @@ test_configs() { test_configs_debian() { set -e - echo -n '::: Testing DNSmasq config: ' - pihole-FTL --test -7 /etc/dnsmasq.d || exit 1 + echo -n '::: Testing pihole-FTL DNS: ' + pihole-FTL test || exit 1 echo -n '::: Testing lighttpd config: ' lighttpd -t -f /etc/lighttpd/lighttpd.conf || exit 1 set +e diff --git a/s6/debian-root/etc/cont-init.d/20-start.sh b/s6/debian-root/etc/cont-init.d/20-start.sh index d39887e..e82dda3 100644 --- a/s6/debian-root/etc/cont-init.d/20-start.sh +++ b/s6/debian-root/etc/cont-init.d/20-start.sh @@ -7,8 +7,7 @@ if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then bashCmd='bash -e -x' fi -# Start dnsmasq for validate_env and gravity.sh -pihole-FTL +# used to start dnsmasq here for gravity to use...now that conflicts port 53 $bashCmd /start.sh gravity.sh diff --git a/test/test_bash_functions.py b/test/test_bash_functions.py index a9fa2b7..a35776a 100644 --- a/test/test_bash_functions.py +++ b/test/test_bash_functions.py @@ -131,7 +131,9 @@ def test_debian_setup_php_env(Docker, os, expected_lines, repeat_function): for expected_line in expected_lines: search_config_cmd = "grep -c '{}' /etc/lighttpd/conf-enabled/15-fastcgi-php.conf".format(expected_line) search_config_count = Docker.run(search_config_cmd) - assert search_config_count.stdout.rstrip('\n') == '1' + found_lines = int(search_config_count.stdout.rstrip('\n')) + if found_lines > 1: + assert False, "Found line {} times (more than once): {}".format(searexpected_line) @pytest.mark.parametrize('args,secure,setupVarsHash', [ ('-e ServerIP=1.2.3.4 -e WEBPASSWORD=login', True, 'WEBPASSWORD=6060d59351e8c2f48140f01b2c3f3b61652f396c53a5300ae239ebfbe7d5ff08'),