Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2022-06-06 22:04:44 +01:00
parent 29f81fcfbc
commit cb16942096
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
2 changed files with 1 additions and 3 deletions

View File

@ -172,9 +172,8 @@ expected_debian_lines = [
])
def test_debian_setup_php_env(docker, expected_lines, repeat_function):
''' confirm all expected output is there and nothing else '''
stdout = ''
for _ in range(repeat_function):
stdout = docker.run('. /bash_functions.sh ; eval `grep setup_php_env /start.sh`').stdout
docker.run('. /bash_functions.sh ; eval `grep setup_php_env /start.sh`').stdout
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)

View File

@ -13,7 +13,6 @@ def running_pihole(docker_persist, slow, persist_webserver, persist_tag, start_c
pihole-FTL start based `pihole` script command
Individual tests all must override start_cmd'''
#print docker_persist.run('ps -ef').stdout
assert docker_persist.dig.run('ping -c 1 test_pihole').rc == 0
slow(lambda: docker_persist.run('pgrep pihole-FTL').rc == 0)
slow(lambda: docker_persist.run('pgrep {}'.format(persist_webserver)).rc == 0)