瀏覽代碼

Support old and new versions of requests

Steve Kamerman 7 年之前
父節點
當前提交
612bf72ceb
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py

+ 3 - 2
test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py

@@ -1,6 +1,8 @@
 import pytest
 import pytest
+from backports.ssl_match_hostname import CertificateError
 from requests.exceptions import SSLError
 from requests.exceptions import SSLError
 
 
+
 @pytest.mark.parametrize("subdomain,should_redirect_to_https", [
 @pytest.mark.parametrize("subdomain,should_redirect_to_https", [
     (1, True),
     (1, True),
     (2, True),
     (2, True),
@@ -22,10 +24,9 @@ def test_https_get_served(docker_compose, nginxproxy, subdomain):
 
 
 
 
 def test_web3_https_is_500_and_SSL_validation_fails(docker_compose, nginxproxy):
 def test_web3_https_is_500_and_SSL_validation_fails(docker_compose, nginxproxy):
-    with pytest.raises(SSLError) as excinfo:
+    with pytest.raises( (CertificateError, SSLError) ) as excinfo:
         nginxproxy.get("https://3.web.nginx-proxy.tld/port")
         nginxproxy.get("https://3.web.nginx-proxy.tld/port")
     assert """hostname '3.web.nginx-proxy.tld' doesn't match 'nginx-proxy.tld'""" in str(excinfo.value)
     assert """hostname '3.web.nginx-proxy.tld' doesn't match 'nginx-proxy.tld'""" in str(excinfo.value)
 
 
-
     r = nginxproxy.get("https://3.web.nginx-proxy.tld/port", verify=False)
     r = nginxproxy.get("https://3.web.nginx-proxy.tld/port", verify=False)
     assert r.status_code == 500
     assert r.status_code == 500