Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-21 01:10:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding fix for #229

Browse Source 
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
This commit is contained in:
diginc
2018-02-22 23:11:53 -06:00
parent cdcc882d28
commit 53f766876e
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/test_bash_functions.py
View File

@@ -31,6 +31,13 @@ def test_overrides_default_WEB_PORT(Docker, os, args):
config = Docker.run('cat {}'.format( WEB_CONFIG[os])).stdout
for expected_line in CONFIG_LINES[os]:
assert re.search(expected_line, config) != None
# grep fails to find any of the old address w/o port
assert Docker.run('grep -rq "://127.0.0.1/" /var/www/html/').rc == 1
assert Docker.run('grep -rq "://pi.hole/" /var/www/html/').rc == 1
# Find at least one instance of our changes
# upstream repos determines how many and I don't want to keep updating this test
assert int(Docker.run('grep -rl "://127.0.0.1:999/" /var/www/html/ | wc -l').stdout) >= 1
assert int(Docker.run('grep -rl "://pi.hole:999/" /var/www/html/ | wc -l').stdout) >= 1
@pytest.mark.parametrize('args,expected_error', [
(DEFAULTARGS + '-e WEB_PORT="LXXX"', 'WARNING: Custom WEB_PORT not used - LXXX is not an integer'),