From 92e1a6567ead9e2cdb7dea17774b0a20d187af6a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 17 Jan 2023 00:02:02 -0500
Subject: [PATCH] tests: Remove extraction of `nginx.tmpl` (now unnecessary)

---
 test/test_dockergen/test_dockergen_v2.py  | 36 ++---------------------
 test/test_dockergen/test_dockergen_v2.yml |  2 +-
 test/test_dockergen/test_dockergen_v3.py  | 33 ++-------------------
 test/test_dockergen/test_dockergen_v3.yml |  2 +-
 4 files changed, 6 insertions(+), 67 deletions(-)

diff --git a/test/test_dockergen/test_dockergen_v2.py b/test/test_dockergen/test_dockergen_v2.py
index 43b1431..dbb15d4 100644
--- a/test/test_dockergen/test_dockergen_v2.py
+++ b/test/test_dockergen/test_dockergen_v2.py
@@ -1,41 +1,9 @@
-import os
-import docker
-import logging
-import pytest
-
-
-@pytest.fixture(scope="module")
-def nginx_tmpl():
-    """
-    pytest fixture which extracts the the nginx config template from
-    the nginxproxy/nginx-proxy:test image
-    """
-    script_dir = os.path.dirname(__file__)
-    logging.info("extracting nginx.tmpl from nginxproxy/nginx-proxy:test")
-    docker_client = docker.from_env()
-    print(
-        docker_client.containers.run(
-            image="nginxproxy/nginx-proxy:test",
-            remove=True,
-            volumes=["{current_dir}:{current_dir}".format(current_dir=script_dir)],
-            entrypoint="sh",
-            command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(
-                current_dir=script_dir
-            ),
-            stderr=True,
-        )
-    )
-    yield
-    logging.info("removing nginx.tmpl")
-    os.remove(os.path.join(script_dir, "nginx.tmpl"))
-
-
-def test_unknown_virtual_host_is_503(nginx_tmpl, docker_compose, nginxproxy):
+def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
     r = nginxproxy.get("http://unknown.nginx.container.docker/")
     assert r.status_code == 503
 
 
-def test_forwards_to_whoami(nginx_tmpl, docker_compose, nginxproxy):
+def test_forwards_to_whoami(docker_compose, nginxproxy):
     r = nginxproxy.get("http://whoami.nginx.container.docker/")
     assert r.status_code == 200
     whoami_container = docker_compose.containers.get("whoami")
diff --git a/test/test_dockergen/test_dockergen_v2.yml b/test/test_dockergen/test_dockergen_v2.yml
index b1f443c..36ee1c1 100644
--- a/test/test_dockergen/test_dockergen_v2.yml
+++ b/test/test_dockergen/test_dockergen_v2.yml
@@ -14,7 +14,7 @@ services:
       - nginx
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
+      - ../../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
 
   web:
     image: web
diff --git a/test/test_dockergen/test_dockergen_v3.py b/test/test_dockergen/test_dockergen_v3.py
index 67561bf..b696e6c 100644
--- a/test/test_dockergen/test_dockergen_v3.py
+++ b/test/test_dockergen/test_dockergen_v3.py
@@ -1,8 +1,5 @@
-import os
 import docker
-import logging
 import pytest
-import re
 from distutils.version import LooseVersion
 
 
@@ -13,38 +10,12 @@ pytestmark = pytest.mark.skipif(
 )
 
 
-@pytest.fixture(scope="module")
-def nginx_tmpl():
-    """
-    pytest fixture which extracts the the nginx config template from
-    the nginxproxy/nginx-proxy:test image
-    """
-    script_dir = os.path.dirname(__file__)
-    logging.info("extracting nginx.tmpl from nginxproxy/nginx-proxy:test")
-    docker_client = docker.from_env()
-    print(
-        docker_client.containers.run(
-            image="nginxproxy/nginx-proxy:test",
-            remove=True,
-            volumes=["{current_dir}:{current_dir}".format(current_dir=script_dir)],
-            entrypoint="sh",
-            command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(
-                current_dir=script_dir
-            ),
-            stderr=True,
-        )
-    )
-    yield
-    logging.info("removing nginx.tmpl")
-    os.remove(os.path.join(script_dir, "nginx.tmpl"))
-
-
-def test_unknown_virtual_host_is_503(nginx_tmpl, docker_compose, nginxproxy):
+def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
     r = nginxproxy.get("http://unknown.nginx.container.docker/")
     assert r.status_code == 503
 
 
-def test_forwards_to_whoami(nginx_tmpl, docker_compose, nginxproxy):
+def test_forwards_to_whoami(docker_compose, nginxproxy):
     r = nginxproxy.get("http://whoami.nginx.container.docker/")
     assert r.status_code == 200
     whoami_container = docker_compose.containers.get("whoami")
diff --git a/test/test_dockergen/test_dockergen_v3.yml b/test/test_dockergen/test_dockergen_v3.yml
index 8339273..8b0411c 100644
--- a/test/test_dockergen/test_dockergen_v3.yml
+++ b/test/test_dockergen/test_dockergen_v3.yml
@@ -11,7 +11,7 @@ services:
     command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
+      - ../../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
       - nginx_conf:/etc/nginx/conf.d
 
   web: