fix startup 53 port conflict and test error

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

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

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'),