diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-26 01:23:59 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-26 01:23:59 +0200 |
commit | b13acd7956f2e09bf5f9001f8f55d018a381f6c2 (patch) | |
tree | 0cb1a99bcd453c435886a0bfd516520e1cd13612 /test/test_server.py | |
parent | a978c6b9cee134d01f84216f3fbcf1ae9303d965 (diff) | |
download | mitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.tar.gz mitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.tar.bz2 mitmproxy-b13acd7956f2e09bf5f9001f8f55d018a381f6c2.zip |
adjust to netlib request changes + docs
Diffstat (limited to 'test/test_server.py')
-rw-r--r-- | test/test_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_server.py b/test/test_server.py index 5f644c96..2a09d2e5 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -235,7 +235,8 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin): # There's a race here, which means we can get any of a number of errors. # Rather than introduce yet another sleep into the test suite, we just # relax the Exception specification. - tutils.raises(Exception, p.request, "get:'%s'" % response) + with raises(Exception): + p.request("get:'%s'" % response) def test_reconnect(self): req = "get:'%s/p/200:b@1:da'" % self.server.urlbase @@ -573,7 +574,6 @@ class TestProxy(tservers.HTTPProxTest): recvd += len(connection.recv(5000)) connection.close() - print(self.master.state.view._list) first_flow = self.master.state.view[0] second_flow = self.master.state.view[1] assert first_flow.server_conn.timestamp_tcp_setup |