File tree Expand file tree Collapse file tree 2 files changed +10
-20
lines changed
Expand file tree Collapse file tree 2 files changed +10
-20
lines changed Original file line number Diff line number Diff line change 66def test_ftlconf_webserver_port (docker ):
77 func = docker .run ("echo ${FTLCONF_webserver_port}" )
88 assert "999" in func .stdout
9- func = docker .run (
10- """
9+ func = docker .run ("""
1110 sleep 5
1211 pihole-FTL --config webserver.port
13- """
14- )
12+ """ )
1513 assert "999" in func .stdout
1614
1715
@@ -22,12 +20,10 @@ def test_ftlconf_webserver_port(docker):
2220def test_ftlconf_dns_upstreams (docker ):
2321 func = docker .run ("echo ${FTLCONF_dns_upstreams}" )
2422 assert "1.2.3.4;5.6.7.8#1234" in func .stdout
25- func = docker .run (
26- """
23+ func = docker .run ("""
2724 sleep 5
2825 pihole-FTL --config dns.upstreams
29- """
30- )
26+ """ )
3127 assert "[ 1.2.3.4, 5.6.7.8#1234 ]" in func .stdout
3228
3329
Original file line number Diff line number Diff line change 77def test_pihole_uid_env_var (docker ):
88 func = docker .run ("echo ${PIHOLE_UID}" )
99 assert "456" in func .stdout
10- func = docker .run (
11- """
10+ func = docker .run ("""
1211 sleep 5
1312 id -u pihole
14- """
15- )
13+ """ )
1614 assert "456" in func .stdout
1715
1816
@@ -21,12 +19,10 @@ def test_pihole_uid_env_var(docker):
2119def test_pihole_gid_env_var (docker ):
2220 func = docker .run ("echo ${PIHOLE_GID}" )
2321 assert "456" in func .stdout
24- func = docker .run (
25- """
22+ func = docker .run ("""
2623 sleep 5
2724 id -g pihole
28- """
29- )
25+ """ )
3026 assert "456" in func .stdout
3127
3228
@@ -90,11 +86,9 @@ def test_pihole_ftl_starts_and_shuts_down_cleanly(docker):
9086
9187
9288def test_cronfile_valid (docker ):
93- func = docker .run (
94- """
89+ func = docker .run ("""
9590 /usr/bin/crontab /crontab.txt
9691 crond -d 8 -L /cron.log
9792 grep 'parse error' /cron.log
98- """
99- )
93+ """ )
10094 assert "parse error" not in func .stdout
You can’t perform that action at this time.
0 commit comments