diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2018-04-05 15:30:04 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2018-04-05 15:30:04 +0200 |
| commit | 50ea3aa420588d67acc17022a9824e819d22c4b1 (patch) | |
| tree | 3cc73a8416db46d8a962c3f021e2b80471d140a5 /test | |
| parent | 8e54a365fa9617f3037946538044a9905b422952 (diff) | |
| download | mitmproxy-50ea3aa420588d67acc17022a9824e819d22c4b1.tar.gz mitmproxy-50ea3aa420588d67acc17022a9824e819d22c4b1.tar.bz2 mitmproxy-50ea3aa420588d67acc17022a9824e819d22c4b1.zip | |
fix http retry timeout
this fixes #3038
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/proxy/test_server.py | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/test/mitmproxy/proxy/test_server.py b/test/mitmproxy/proxy/test_server.py index aed4a774..f594fb40 100644 --- a/test/mitmproxy/proxy/test_server.py +++ b/test/mitmproxy/proxy/test_server.py @@ -229,28 +229,14 @@ class TestHTTP(tservers.HTTPProxyTest, CommonMixin): p.request("get:'%s'" % response) def test_reconnect(self): - req = "get:'%s/p/200:b@1'" % self.server.urlbase + req = "get:'%s/p/200:b@1:da'" % self.server.urlbase p = self.pathoc() - class MockOnce: - call = 0 - - def mock_once(self, http1obj, req): - self.call += 1 - if self.call == 1: - raise exceptions.TcpDisconnect - else: - headers = http1.assemble_request_head(req) - http1obj.server_conn.wfile.write(headers) - http1obj.server_conn.wfile.flush() - with p.connect(): - with mock.patch("mitmproxy.proxy.protocol.http1.Http1Layer.send_request_headers", - side_effect=MockOnce().mock_once, autospec=True): - # Server disconnects while sending headers but mitmproxy reconnects - resp = p.request(req) - assert resp - assert resp.status_code == 200 + assert p.request(req) + # Server has disconnected. Mitmproxy should detect this, and reconnect. + assert p.request(req) + assert p.request(req) def test_get_connection_switching(self): req = "get:'%s/p/200:b@1'" @@ -1045,22 +1031,6 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest): request again. """ - class MockOnce: - call = 0 - - def mock_once(self, http1obj, req): - self.call += 1 - - if self.call == 2: - headers = http1.assemble_request_head(req) - http1obj.server_conn.wfile.write(headers) - http1obj.server_conn.wfile.flush() - raise exceptions.TcpDisconnect - else: - headers = http1.assemble_request_head(req) - http1obj.server_conn.wfile.write(headers) - http1obj.server_conn.wfile.flush() - self.chain[0].set_addons(RequestKiller([1, 2])) self.chain[1].set_addons(RequestKiller([1])) @@ -1075,9 +1045,7 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest): assert len(self.chain[0].tmaster.state.flows) == 1 assert len(self.chain[1].tmaster.state.flows) == 1 - with mock.patch("mitmproxy.proxy.protocol.http1.Http1Layer.send_request_headers", - side_effect=MockOnce().mock_once, autospec=True): - req = p.request("get:'/p/418:b\"content2\"'") + req = p.request("get:'/p/418:b\"content2\"'") assert req.status_code == 502 |