diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-12-03 18:45:37 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-12-03 18:45:37 +0100 |
commit | 5f159da4888f1b287b3688fe488946881d6a60ca (patch) | |
tree | 29b680a2b5e55438b7b0e0ddc4ed56a82d1b5b7a | |
parent | 77eca7c305c00a2d65bbe81dc84f6b2b9228d052 (diff) | |
download | mitmproxy-5f159da4888f1b287b3688fe488946881d6a60ca.tar.gz mitmproxy-5f159da4888f1b287b3688fe488946881d6a60ca.tar.bz2 mitmproxy-5f159da4888f1b287b3688fe488946881d6a60ca.zip |
fix tests
-rw-r--r-- | test/test_test.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/test/test_test.py b/test/test_test.py index eaaf83d3..bd92d864 100644 --- a/test/test_test.py +++ b/test/test_test.py @@ -12,11 +12,8 @@ class TestDaemonManual: rsp = requests.get("http://localhost:%s/p/202:da" % d.port) assert rsp.ok assert rsp.status_code == 202 - tutils.raises( - "Connection aborted", - requests.get, - "http://localhost:%s/p/202:da" % d.port - ) + with tutils.raises(requests.ConnectionError): + requests.get("http://localhost:%s/p/202:da" % d.port) def test_startstop_ssl(self): d = test.Daemon(ssl=True) @@ -27,11 +24,8 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises( - "Connection aborted", - requests.get, - "http://localhost:%s/p/202:da" % d.port - ) + with tutils.raises(requests.ConnectionError): + requests.get("http://localhost:%s/p/202:da" % d.port) def test_startstop_ssl_explicit(self): ssloptions = dict( @@ -47,8 +41,5 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises( - "Connection aborted", - requests.get, - "http://localhost:%s/p/202:da" % d.port - ) + with tutils.raises(requests.ConnectionError): + requests.get("http://localhost:%s/p/202:da" % d.port) |