diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-21 14:02:56 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-21 14:02:56 +0200 |
| commit | 254a6862358af9d7d98bf443e310f659532d918d (patch) | |
| tree | 71b0b3a2eb502e7ea2235701cb6ae6a133c7f372 /test/test_tcp.py | |
| parent | 6bd5df79f82a33b7e725afb5f279bda4cba41935 (diff) | |
| parent | d382bb27bf4732def621cddb46fc4cc1d2143ab4 (diff) | |
| download | mitmproxy-254a6862358af9d7d98bf443e310f659532d918d.tar.gz mitmproxy-254a6862358af9d7d98bf443e310f659532d918d.tar.bz2 mitmproxy-254a6862358af9d7d98bf443e310f659532d918d.zip | |
Merge branch 'master' into stream
Conflicts:
netlib/http.py
Diffstat (limited to 'test/test_tcp.py')
| -rw-r--r-- | test/test_tcp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py index 77146829..911beccc 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -1,5 +1,5 @@ import cStringIO, Queue, time, socket, random -from netlib import tcp, certutils, test +from netlib import tcp, certutils, test, certffi import mock import tutils from OpenSSL import SSL @@ -419,7 +419,7 @@ class TestPrivkeyGenNoFlags(test.ServerTestBase): def test_privkey(self): c = tcp.TCPClient(("127.0.0.1", self.port)) c.connect() - tutils.raises("unexpected eof", c.convert_to_ssl) + tutils.raises("sslv3 alert handshake failure", c.convert_to_ssl) |