8000 tests: review changes · nginx-proxy/nginx-proxy@f9692e2 · GitHub
[go: up one dir, main page]
Skip to content

Commit f9692e2

Browse files
buchdagSchoNie
buchdag
and
SchoNie
committed
tests: review changes
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
1 parent 836012c commit f9692e2

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

‎test/test_events/test_events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def web2(docker_compose):
5757

5858
def test_nginx_proxy_behavior_when_alone(docker_compose, nginxproxy):
5959
r = nginxproxy.get("http://nginx-proxy/")
60-
assert r.status_code == 503
60+
assert (r.status_code == 503)
6161

6262

6363
def test_new_container_is_detected_vhost(web1, nginxproxy):

‎test/test_fallback/test_fallback.data/custom-fallback.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
66

77
http-only:
88
image: web

‎test/test_fallback/test_fallback.data/nodefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./nodefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/nodefault.certs:/etc/nginx/certs:ro
66

77
https-and-http:
88
image: web

‎test/test_fallback/test_fallback.data/nohttp-on-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./withdefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
66
environment:
77
HTTPS_METHOD: redirect
88

‎test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./withdefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
66
environment:
77
HTTPS_METHOD: nohttp
88

‎test/test_fallback/test_fallback.data/nohttp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./withdefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
66
environment:
77
HTTPS_METHOD: nohttp
88

‎test/test_fallback/test_fallback.data/untrusteddefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./withdefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
66
environment:
77
TRUST_DEFAULT_CERT: "false"
88

‎test/test_fallback/test_fallback.data/withdefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
nginx-proxy:
33
volumes:
44
- /var/run/docker.sock:/tmp/docker.sock:ro
5-
- ./withdefault.certs:/etc/nginx/certs:ro
5+
- ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
66

77
https-and-http:
88
image: web

‎test/test_ipv6/test_ipv6.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pytestmark = pytest.mark.skipif(
66
platform.system() == "Darwin",
7-
reason="Those tests rely entirely on being able to directly contact container's IP"
7+
reason="Those tests rely entirely on being able to directly contact the container's IP"
88
)
99

1010

‎test/test_nominal/test_nominal.py

Li 7113 nes changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_forwards_to_web2(docker_compose, nginxproxy):
2323

2424
@pytest.mark.skipif(
2525
platform.system() == "Darwin",
26-
reason="This test rely on being able to directly contact the container's IP"
26+
reason="This test depends on direct communication with the container's IP"
2727
)
2828
def test_ipv6_is_disabled_by_default(docker_compose, nginxproxy):
2929
with pytest.raises(ConnectionError):

0 commit comments

Comments
 (0)
0