From aa8145b62dbb7e10fbe05358141381ee35241cf3 Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Sat, 4 Jan 2025 17:11:26 +0100
Subject: [PATCH] tests: review changes

Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
---
 test/test_fallback/test_fallback.data/custom-fallback.yml       | 2 +-
 test/test_fallback/test_fallback.data/nodefault.yml             | 2 +-
 test/test_fallback/test_fallback.data/nohttp-on-app.yml         | 2 +-
 .../test_fallback.data/nohttp-with-missing-cert.yml             | 2 +-
 test/test_fallback/test_fallback.data/nohttp.yml                | 2 +-
 test/test_fallback/test_fallback.data/untrusteddefault.yml      | 2 +-
 test/test_fallback/test_fallback.data/withdefault.yml           | 2 +-
 test/test_ipv6/test_ipv6.py                                     | 2 +-
 test/test_nominal/test_nominal.py                               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/test_fallback/test_fallback.data/custom-fallback.yml b/test/test_fallback/test_fallback.data/custom-fallback.yml
index d656aed..32c01b9 100644
--- a/test/test_fallback/test_fallback.data/custom-fallback.yml
+++ b/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
diff --git a/test/test_fallback/test_fallback.data/nodefault.yml b/test/test_fallback/test_fallback.data/nodefault.yml
index 6bcbc60..34724ce 100644
--- a/test/test_fallback/test_fallback.data/nodefault.yml
+++ b/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
diff --git a/test/test_fallback/test_fallback.data/nohttp-on-app.yml b/test/test_fallback/test_fallback.data/nohttp-on-app.yml
index 7d048ed..8e13fcb 100644
--- a/test/test_fallback/test_fallback.data/nohttp-on-app.yml
+++ b/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
 
diff --git a/test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml b/test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
index 0904c8a..47b7d92 100644
--- a/test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
+++ b/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
 
diff --git a/test/test_fallback/test_fallback.data/nohttp.yml b/test/test_fallback/test_fallback.data/nohttp.yml
index c70df07..5f1ec59 100644
--- a/test/test_fallback/test_fallback.data/nohttp.yml
+++ b/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
 
diff --git a/test/test_fallback/test_fallback.data/untrusteddefault.yml b/test/test_fallback/test_fallback.data/untrusteddefault.yml
index dc562be..e5143e1 100644
--- a/test/test_fallback/test_fallback.data/untrusteddefault.yml
+++ b/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"
 
diff --git a/test/test_fallback/test_fallback.data/withdefault.yml b/test/test_fallback/test_fallback.data/withdefault.yml
index 75751d0..fe0d19a 100644
--- a/test/test_fallback/test_fallback.data/withdefault.yml
+++ b/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
diff --git a/test/test_ipv6/test_ipv6.py b/test/test_ipv6/test_ipv6.py
index 6ef8fb2..914dd4e 100644
--- a/test/test_ipv6/test_ipv6.py
+++ b/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"
 )
 
 
diff --git a/test/test_nominal/test_nominal.py b/test/test_nominal/test_nominal.py
index 82ac919..ce8e681 100644
--- a/test/test_nominal/test_nominal.py
+++ b/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):