tests: fix tests

test/test_ssl/test_redirect.py

@@ -4,31 +4,31 @@ import pytest
 # Permanent Redirects
 # https://github.com/nginx-proxy/nginx-proxy/pull/1737
 def test_web1_GET_301(docker_compose, nginxproxy):
-    r = nginxproxy.get('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.get('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 301
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'
 
 def test_web1_POST_308(docker_compose, nginxproxy):
-    r = nginxproxy.post('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.post('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 308
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'
 
 def test_web1_PUT_308(docker_compose, nginxproxy):
-    r = nginxproxy.put('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.put('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 308
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'
 
 def test_web1_HEAD_308(docker_compose, nginxproxy):
-    r = nginxproxy.head('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.head('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 308
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'
 
 def test_web1_DELETE_308(docker_compose, nginxproxy):
-    r = nginxproxy.delete('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.delete('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 308
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'
 
 def test_web1_OPTIONS_308(docker_compose, nginxproxy):
-    r = nginxproxy.options('http://web1.nginx-proxy.tld', allow_redirects=False)
+    r = nginxproxy.options('http://nginx-proxy.tld', allow_redirects=False)
     assert r.status_code == 308
-    assert r.headers['Location'] == 'https://web1.nginx-proxy.tld/'
+    assert r.headers['Location'] == 'https://nginx-proxy.tld/'

test/test_ssl/test_redirect.yml

@@ -5,11 +5,10 @@ services:
       - "81"
     environment:
       WEB_PORTS: "81"
-      VIRTUAL_HOST: "web1.nginx-proxy.tld"
+      VIRTUAL_HOST: "nginx-proxy.tld"
 
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
       - ./certs:/etc/nginx/certs:ro