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

merge in dev/master armel goodies

This commit is contained in:
Adam Hill 2018-07-19 22:18:34 -05:00
parent 478b98c503
commit 520669a6b9
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_bash_functions.py
View File

@ -135,7 +135,7 @@ def test_debian_setup_php_env(Docker, os, expected_lines, repeat_function):
search_config_count = Docker.run(search_config_cmd)
found_lines = int(search_config_count.stdout.rstrip('\n'))
if found_lines > 1:
assert False, "Found line {} times (more than once): {}".format(searexpected_line)
assert False, "Found line {} times (more than once): {}".format(expected_line)
@pytest.mark.parametrize('args,secure,setupVarsHash', [
('-e ServerIP=1.2.3.4 -e WEBPASSWORD=login', True, 'WEBPASSWORD=6060d59351e8c2f48140f01b2c3f3b61652f396c53a5300ae239ebfbe7d5ff08'),