thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 03:46:29 +00:00
Code Issues Releases Wiki Activity

Fixed tests that are now failing due to the dhparam clearing command beating the nginx startup. This is fixed permanently in #1213, but this PR fixes the test so as not to rely on the dhparam autogen, which is tested elsewhere.

Browse Source
This commit is contained in:
Steve Kamerman 2019-02-04 15:15:04 -05:00
parent 7dd97d4bc3
commit ad41178036
No known key found for this signature in database
GPG Key ID: D39F3EEFC1837DF1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml
View File

@ -7,6 +7,7 @@ services:
volumes: volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:ro
- ./certs:/etc/nginx/certs:ro - ./certs:/etc/nginx/certs:ro
- ../../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
web1: web1:
image: web image: web
@ -30,4 +31,4 @@ services:
environment: environment:
WEB_PORTS: "83" WEB_PORTS: "83"
VIRTUAL_HOST: "3.web.nginx-proxy.tld" VIRTUAL_HOST: "3.web.nginx-proxy.tld"
HTTPS_METHOD: nohttps HTTPS_METHOD: nohttps

1
test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py
View File

@ -11,6 +11,7 @@ from requests.exceptions import SSLError
def test_http_redirects_to_https(docker_compose, nginxproxy, subdomain, should_redirect_to_https): def test_http_redirects_to_https(docker_compose, nginxproxy, subdomain, should_redirect_to_https):
r = nginxproxy.get("http://%s.web.nginx-proxy.tld/port" % subdomain) r = nginxproxy.get("http://%s.web.nginx-proxy.tld/port" % subdomain)
if should_redirect_to_https: if should_redirect_to_https:
assert len(r.history) > 0
assert r.history[0].is_redirect assert r.history[0].is_redirect
assert r.history[0].headers.get("Location") == "https://%s.web.nginx-proxy.tld/port" % subdomain assert r.history[0].headers.get("Location") == "https://%s.web.nginx-proxy.tld/port" % subdomain
assert "answer from port 8%s\n" % subdomain == r.text assert "answer from port 8%s\n" % subdomain == r.text