diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-08-09 19:49:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-08-09 19:49:36 +0200 |
| commit | b27e456ce2150d638b4eef73703da8a30722d392 (patch) | |
| tree | 2ba82b15f1bdf22f12b7d97e726dcbd19374e9cf /test/netlib/test_tcp.py | |
| parent | 78bd99f97c36ba24bbab389350eb8e80ba16738f (diff) | |
| parent | dcfa7027aed5a8d4aa80aff67fc299298659fb1b (diff) | |
| download | mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.gz mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.bz2 mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.zip | |
merge with master
Diffstat (limited to 'test/netlib/test_tcp.py')
| -rw-r--r-- | test/netlib/test_tcp.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py index 273427d5..dc2f4e7e 100644 --- a/test/netlib/test_tcp.py +++ b/test/netlib/test_tcp.py @@ -213,7 +213,7 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase): # Verification errors should be saved even if connection isn't aborted # aborted - assert c.ssl_verification_error is not None + assert c.ssl_verification_error testval = b"echo!\n" c.wfile.write(testval) @@ -226,7 +226,7 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase): c.convert_to_ssl(verify_options=SSL.VERIFY_NONE) # Verification errors should be saved even if connection isn't aborted - assert c.ssl_verification_error is not None + assert c.ssl_verification_error testval = b"echo!\n" c.wfile.write(testval) @@ -243,11 +243,11 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase): ca_pemfile=tutils.test_data.path("data/verificationcerts/trusted-root.crt") ) - assert c.ssl_verification_error is not None + assert c.ssl_verification_error # Unknown issuing certificate authority for first certificate - assert c.ssl_verification_error['errno'] == 18 - assert c.ssl_verification_error['depth'] == 0 + assert "errno: 18" in str(c.ssl_verification_error) + assert "depth: 0" in str(c.ssl_verification_error) class TestSSLUpstreamCertVerificationWBadHostname(tservers.ServerTestBase): @@ -276,7 +276,7 @@ class TestSSLUpstreamCertVerificationWBadHostname(tservers.ServerTestBase): verify_options=SSL.VERIFY_PEER, ca_pemfile=tutils.test_data.path("data/verificationcerts/trusted-root.crt") ) - assert c.ssl_verification_error is not None + assert c.ssl_verification_error class TestSSLUpstreamCertVerificationWValidCertChain(tservers.ServerTestBase): |