diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-19 23:37:31 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 23:37:31 +1300 |
| commit | ee56d3fae0baeef1f31a83db122dd832d4c0e07e (patch) | |
| tree | 66b40669cfcb604776a5b19adca2f55ffe96c44a /test | |
| parent | e9f7cf68e90ed9269b4b51342fcd652666096b56 (diff) | |
| parent | 9e7438fb18d2307f9248914f5cff65529a4d8a97 (diff) | |
| download | mitmproxy-ee56d3fae0baeef1f31a83db122dd832d4c0e07e.tar.gz mitmproxy-ee56d3fae0baeef1f31a83db122dd832d4c0e07e.tar.bz2 mitmproxy-ee56d3fae0baeef1f31a83db122dd832d4c0e07e.zip | |
Merge pull request #1635 from cortesi/refactor3
mitmproxy.protocol -> mitmproxy.proxy.protocol
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/addons/test_clientplayback.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/tutils.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/addons/test_clientplayback.py b/test/mitmproxy/addons/test_clientplayback.py index c5407d18..f15b6290 100644 --- a/test/mitmproxy/addons/test_clientplayback.py +++ b/test/mitmproxy/addons/test_clientplayback.py @@ -14,7 +14,7 @@ class TestClientPlayback: f = tutils.tflow(resp=True) cp.load([f]) assert cp.count() == 1 - RP = "mitmproxy.protocol.http_replay.RequestReplayThread" + RP = "mitmproxy.proxy.protocol.http_replay.RequestReplayThread" with mock.patch(RP) as rp: assert not cp.current with mastertest.mockctx(): diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py index 9724516b..eb0c90e9 100644 --- a/test/mitmproxy/tutils.py +++ b/test/mitmproxy/tutils.py @@ -92,10 +92,10 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None): """ @type client_conn: bool | None | mitmproxy.proxy.connection.ClientConnection @type server_conn: bool | None | mitmproxy.proxy.connection.ServerConnection - @type req: bool | None | mitmproxy.protocol.http.HTTPRequest - @type resp: bool | None | mitmproxy.protocol.http.HTTPResponse - @type err: bool | None | mitmproxy.protocol.primitives.Error - @return: mitmproxy.protocol.http.HTTPFlow + @type req: bool | None | mitmproxy.proxy.protocol.http.HTTPRequest + @type resp: bool | None | mitmproxy.proxy.protocol.http.HTTPResponse + @type err: bool | None | mitmproxy.proxy.protocol.primitives.Error + @return: mitmproxy.proxy.protocol.http.HTTPFlow """ if client_conn is True: client_conn = tclient_conn() @@ -160,7 +160,7 @@ def tserver_conn(): def terr(content="error"): """ - @return: mitmproxy.protocol.primitives.Error + @return: mitmproxy.proxy.protocol.primitives.Error """ err = flow.Error(content) return err |