fix startup 53 port conflict and test error
This commit is contained in:
parent
ad6b4be403
commit
3877a171da
|
@ -226,8 +226,8 @@ test_configs() {
|
||||||
|
|
||||||
test_configs_debian() {
|
test_configs_debian() {
|
||||||
set -e
|
set -e
|
||||||
echo -n '::: Testing DNSmasq config: '
|
echo -n '::: Testing pihole-FTL DNS: '
|
||||||
pihole-FTL --test -7 /etc/dnsmasq.d || exit 1
|
pihole-FTL test || exit 1
|
||||||
echo -n '::: Testing lighttpd config: '
|
echo -n '::: Testing lighttpd config: '
|
||||||
lighttpd -t -f /etc/lighttpd/lighttpd.conf || exit 1
|
lighttpd -t -f /etc/lighttpd/lighttpd.conf || exit 1
|
||||||
set +e
|
set +e
|
||||||
|
|
|
@ -7,8 +7,7 @@ if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
||||||
bashCmd='bash -e -x'
|
bashCmd='bash -e -x'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Start dnsmasq for validate_env and gravity.sh
|
# used to start dnsmasq here for gravity to use...now that conflicts port 53
|
||||||
pihole-FTL
|
|
||||||
|
|
||||||
$bashCmd /start.sh
|
$bashCmd /start.sh
|
||||||
gravity.sh
|
gravity.sh
|
||||||
|
|
|
@ -131,7 +131,9 @@ def test_debian_setup_php_env(Docker, os, expected_lines, repeat_function):
|
||||||
for expected_line in expected_lines:
|
for expected_line in expected_lines:
|
||||||
search_config_cmd = "grep -c '{}' /etc/lighttpd/conf-enabled/15-fastcgi-php.conf".format(expected_line)
|
search_config_cmd = "grep -c '{}' /etc/lighttpd/conf-enabled/15-fastcgi-php.conf".format(expected_line)
|
||||||
search_config_count = Docker.run(search_config_cmd)
|
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', [
|
@pytest.mark.parametrize('args,secure,setupVarsHash', [
|
||||||
('-e ServerIP=1.2.3.4 -e WEBPASSWORD=login', True, 'WEBPASSWORD=6060d59351e8c2f48140f01b2c3f3b61652f396c53a5300ae239ebfbe7d5ff08'),
|
('-e ServerIP=1.2.3.4 -e WEBPASSWORD=login', True, 'WEBPASSWORD=6060d59351e8c2f48140f01b2c3f3b61652f396c53a5300ae239ebfbe7d5ff08'),
|
||||||
|
|
Loading…
Reference in New Issue