tests: standardize file structure & naming

test/stress_tests/README.md

@@ -1 +0,0 @@
-This directory contains tests that showcase scenarios known to break the expected behavior of nginx-proxy.

test/test_build/test_build.py

@@ -1,8 +1,8 @@
 """
 Test that nginx-proxy-tester can build successfully
 """
+import pathlib
 import re
-import os
 
 import docker
 import pytest
@@ -13,12 +13,13 @@ client = docker.from_env()
 @pytest.fixture(scope = "session")
 def docker_build(request):
     # Define Dockerfile path
-    dockerfile_path = os.path.join(os.path.dirname(__file__), "requirements/")
+    current_file_path = pathlib.Path(__file__)
+    dockerfile_path = current_file_path.parent.parent.joinpath("requirements")
     dockerfile_name = "Dockerfile-nginx-proxy-tester"
 
     # Build the Docker image
     image, logs = client.images.build(
-        path = dockerfile_path,
+        path = dockerfile_path.as_posix(),
         dockerfile = dockerfile_name,
         rm = True,  # Remove intermediate containers
         tag = "nginx-proxy-tester-ci",  # Tag for the built image

test/test_events/test_events.py

@@ -22,7 +22,7 @@ def web1(docker_compose):
         },
         ports={"81/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
@@ -47,7 +47,7 @@ def web2(docker_compose):
         },
         ports={"82/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:

test/test_events/test_events.yml

@@ -1,3 +1,7 @@
+networks:
+  default:
+    name: test_events-net
+
 services:
   nginxproxy:
     image: nginxproxy/nginx-proxy:test

test/test_location-override/test_location-override.yml

@@ -3,7 +3,7 @@ services:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./test_location-override.vhost.d:/etc/nginx/vhost.d:ro
+      - ./vhost.d:/etc/nginx/vhost.d:ro
 
   explicit-root:
     image: web