diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-04-09 16:47:05 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-04-09 16:47:05 -0700 |
| commit | dcdee7dc461677d8beef0ffba1eb2b30ae064609 (patch) | |
| tree | ddf534c7e6e47fedd2681fa3c77458b4aaeef7cd /test | |
| parent | 4d16bb8cb6963b866937a566bdbd40a85cd6c53f (diff) | |
| download | mitmproxy-dcdee7dc461677d8beef0ffba1eb2b30ae064609.tar.gz mitmproxy-dcdee7dc461677d8beef0ffba1eb2b30ae064609.tar.bz2 mitmproxy-dcdee7dc461677d8beef0ffba1eb2b30ae064609.zip | |
server replay: keep --kill active
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_dump.py | 5 | ||||
| -rw-r--r-- | test/mitmproxy/test_flow.py | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/test/mitmproxy/test_dump.py b/test/mitmproxy/test_dump.py index 7e772881..ad4cee53 100644 --- a/test/mitmproxy/test_dump.py +++ b/test/mitmproxy/test_dump.py @@ -68,8 +68,9 @@ class TestDumpMaster: m.handle_clientconnect(f.client_conn) m.handle_serverconnect(f.server_conn) m.handle_request(f) - f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=content)) - f = m.handle_response(f) + if not f.error: + f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=content)) + f = m.handle_response(f) m.handle_clientdisconnect(f.client_conn) return f diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 1fadb23d..7ede7a81 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -904,16 +904,6 @@ class TestFlowMaster: assert not fm.do_server_playback(r) assert fm.do_server_playback(tutils.tflow()) - fm.start_server_playback( - pb, - False, - [], - True, - False, - None, - False, - None, - False) q = queue.Queue() fm.tick(q, 0) assert fm.should_exit.is_set() |