TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image

test/requirements/web/webserver.py

@@ -17,6 +17,9 @@ class Handler(http.server.SimpleHTTPRequestHandler):
         elif self.path == "/port":
             response = "answer from port %s\n" % PORT
             self.wfile.write(response.encode())
+        elif self.path == "/":
+            response = "I'm %s\n" % os.environ['HOSTNAME']
+            self.wfile.write(response.encode())
         else:
             self.wfile.write("No route for this path!\n".encode())
 

test/test_dockergen/test_dockergen_v2.py

@@ -6,23 +6,24 @@ import pytest
 
 @pytest.yield_fixture(scope="module")
 def nginx_tmpl():
-	"""
+    """
-	pytest fixture which extracts the the nginx config template from
+    pytest fixture which extracts the the nginx config template from
-	the jwilder/nginx-proxy:test image
+    the jwilder/nginx-proxy:test image
-	"""
+    """
-	script_dir = os.path.dirname(__file__)
+    script_dir = os.path.dirname(__file__)
-	logging.info("extracting nginx.tmpl from jwilder/nginx-proxy:test")
+    logging.info("extracting nginx.tmpl from jwilder/nginx-proxy:test")
-	docker_client = docker.from_env()
+    docker_client = docker.from_env()
-	print(docker_client.containers.run(
+    print(docker_client.containers.run(
-		image='jwilder/nginx-proxy:test',
+        image='jwilder/nginx-proxy:test',
-		remove=True,
+        remove=True,
-		volumes=['{current_dir}:{current_dir}'.format(current_dir=script_dir)],
+        volumes=['{current_dir}:{current_dir}'.format(current_dir=script_dir)],
-		entrypoint='sh',
+        entrypoint='sh',
-		command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(current_dir=script_dir),
+        command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(
-		stderr=True))
+            current_dir=script_dir),
-	yield
+        stderr=True))
-	logging.info("removing nginx.tmpl")
+    yield
-	os.remove(os.path.join(script_dir, "nginx.tmpl"))
+    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):
@@ -35,4 +36,3 @@ def test_forwards_to_whoami(nginx_tmpl, docker_compose, nginxproxy):
     assert r.status_code == 200
     whoami_container = docker_compose.containers.get("whoami")
     assert r.text == "I'm %s\n" % whoami_container.id[:12]
-

test/test_dockergen/test_dockergen_v2.yml

@@ -16,8 +16,11 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
 
-  whoami:
+  web:
-    image: jwilder/whoami
+    image: web
     container_name: whoami
+    expose:
+      - "80"
     environment:
-      - VIRTUAL_HOST=whoami.nginx.container.docker
+      WEB_PORTS: 80
+      VIRTUAL_HOST: whoami.nginx.container.docker

test/test_dockergen/test_dockergen_v3.py

@@ -7,30 +7,32 @@ import pytest
 def versiontuple(v):
     return tuple(map(int, (v.split("."))))
 
+
 docker_version = docker.from_env().version()['Version']
 pytestmark = pytest.mark.skipif(versiontuple(docker_version) < versiontuple('1.13'),
-	reason="Docker compose syntax v3 requires docker engine v1.13")
+                                reason="Docker compose syntax v3 requires docker engine v1.13")
 
 
 @pytest.yield_fixture(scope="module")
 def nginx_tmpl():
-	"""
+    """
-	pytest fixture which extracts the the nginx config template from
+    pytest fixture which extracts the the nginx config template from
-	the jwilder/nginx-proxy:test image
+    the jwilder/nginx-proxy:test image
-	"""
+    """
-	script_dir = os.path.dirname(__file__)
+    script_dir = os.path.dirname(__file__)
-	logging.info("extracting nginx.tmpl from jwilder/nginx-proxy:test")
+    logging.info("extracting nginx.tmpl from jwilder/nginx-proxy:test")
-	docker_client = docker.from_env()
+    docker_client = docker.from_env()
-	print(docker_client.containers.run(
+    print(docker_client.containers.run(
-		image='jwilder/nginx-proxy:test',
+        image='jwilder/nginx-proxy:test',
-		remove=True,
+        remove=True,
-		volumes=['{current_dir}:{current_dir}'.format(current_dir=script_dir)],
+        volumes=['{current_dir}:{current_dir}'.format(current_dir=script_dir)],
-		entrypoint='sh',
+        entrypoint='sh',
-		command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(current_dir=script_dir),
+        command='-xc "cp /app/nginx.tmpl {current_dir} && chmod 777 {current_dir}/nginx.tmpl"'.format(
-		stderr=True))
+            current_dir=script_dir),
-	yield
+        stderr=True))
-	logging.info("removing nginx.tmpl")
+    yield
-	os.remove(os.path.join(script_dir, "nginx.tmpl"))
+    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):
@@ -43,4 +45,3 @@ def test_forwards_to_whoami(nginx_tmpl, docker_compose, nginxproxy):
     assert r.status_code == 200
     whoami_container = docker_compose.containers.get("whoami")
     assert r.text == "I'm %s\n" % whoami_container.id[:12]
-

test/test_dockergen/test_dockergen_v3.yml

@@ -14,11 +14,14 @@ services:
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
       - nginx_conf:/etc/nginx/conf.d
 
-  whoami:
+  web:
-    image: jwilder/whoami
+    image: web
     container_name: whoami
+    expose:
+      - "80"
     environment:
-      - VIRTUAL_HOST=whoami.nginx.container.docker
+      WEB_PORTS: 80
+      VIRTUAL_HOST: whoami.nginx.container.docker
 
 volumes:
   nginx_conf: {}