diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-11-18 09:04:49 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-11-18 09:04:49 +1300 |
| commit | e40482576ca5b03f7c65332b8f1409366f7adbd9 (patch) | |
| tree | 625904b72356835adbe19f79015ef97843a3fb5e /test/test_test.py | |
| parent | b11260f064ef6f2341d2b637f2e9a4dcc5b9f50c (diff) | |
| download | mitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.tar.gz mitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.tar.bz2 mitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.zip | |
Add disconnect specifiers to test suite.
Fixes hangs seen in test suite with recent versions of requetss.
Diffstat (limited to 'test/test_test.py')
| -rw-r--r-- | test/test_test.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_test.py b/test/test_test.py index 538fc056..fc97d263 100644 --- a/test/test_test.py +++ b/test/test_test.py @@ -8,18 +8,18 @@ logging.disable(logging.CRITICAL) class TestDaemonManual: def test_simple(self): with test.Daemon() as d: - rsp = requests.get("http://localhost:%s/p/202"%d.port) + 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"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) def test_startstop_ssl(self): d = test.Daemon(ssl=True) - rsp = requests.get("https://localhost:%s/p/202"%d.port, verify=False) + rsp = requests.get("https://localhost:%s/p/202:da"%d.port, verify=False) assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) def test_startstop_ssl_explicit(self): ssloptions = dict( @@ -27,10 +27,10 @@ class TestDaemonManual: certfile = utils.data.path("resources/server.crt"), ) d = test.Daemon(ssl=ssloptions) - rsp = requests.get("https://localhost:%s/p/202"%d.port, verify=False) + rsp = requests.get("https://localhost:%s/p/202:da"%d.port, verify=False) assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) |