Browse Source

tests: review changes

Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
Nicolas Duchon 5 months ago
parent
commit
aa8145b62d

+ 1 - 1
test/test_fallback/test_fallback.data/custom-fallback.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
 
   http-only:
     image: web

+ 1 - 1
test/test_fallback/test_fallback.data/nodefault.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./nodefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/nodefault.certs:/etc/nginx/certs:ro
 
   https-and-http:
     image: web

+ 1 - 1
test/test_fallback/test_fallback.data/nohttp-on-app.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: redirect
 

+ 1 - 1
test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
 

+ 1 - 1
test/test_fallback/test_fallback.data/nohttp.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
 

+ 1 - 1
test/test_fallback/test_fallback.data/untrusteddefault.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       TRUST_DEFAULT_CERT: "false"
 

+ 1 - 1
test/test_fallback/test_fallback.data/withdefault.yml

@@ -2,7 +2,7 @@ services:
   nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
 
   https-and-http:
     image: web

+ 1 - 1
test/test_ipv6/test_ipv6.py

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

+ 1 - 1
test/test_nominal/test_nominal.py

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