diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2014-10-24 14:01:34 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2014-10-24 14:01:34 +1300 |
commit | 962a414327d93b604a59a4b8c8582d359745009d (patch) | |
tree | b9ef7b756eabb723c66d152b5eae526b4a28ca01 /test/test_test.py | |
parent | 60e3e0b898861804a475fc0f0e860ad5ec51fe13 (diff) | |
download | mitmproxy-962a414327d93b604a59a4b8c8582d359745009d.tar.gz mitmproxy-962a414327d93b604a59a4b8c8582d359745009d.tar.bz2 mitmproxy-962a414327d93b604a59a4b8c8582d359745009d.zip |
Fix tests, re-add scripts
Diffstat (limited to 'test/test_test.py')
-rw-r--r-- | test/test_test.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/test/test_test.py b/test/test_test.py index 0a05f1c1..345b215a 100644 --- a/test/test_test.py +++ b/test/test_test.py @@ -4,13 +4,18 @@ from libpathod import test import tutils logging.disable(logging.CRITICAL) + class TestDaemonManual: def test_simple(self): with test.Daemon() as d: rsp = requests.get("http://localhost:%s/p/202:da"%d.port) assert rsp.ok assert rsp.status_code == 202 - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises( + "Connection aborted", + requests.get, + "http://localhost:%s/p/202:da"%d.port + ) def test_startstop_ssl(self): d = test.Daemon(ssl=True) @@ -18,7 +23,11 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises( + "Connection aborted", + requests.get, + "http://localhost:%s/p/202:da"%d.port + ) def test_startstop_ssl_explicit(self): ssloptions = dict( @@ -31,6 +40,10 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises( + "Connection aborted", + requests.get, + "http://localhost:%s/p/202:da"%d.port + ) |