diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-04-04 14:52:24 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-04-07 09:04:14 +1200 |
| commit | 9dcd15d350aa5e2ee2d6f7299d0183cabddeb992 (patch) | |
| tree | b02a58edf7402c3f0f9a898a71d9e384bea4ecf2 /test | |
| parent | 6a08ef465f3af6cb2044baf98279de1071538f5a (diff) | |
| download | mitmproxy-9dcd15d350aa5e2ee2d6f7299d0183cabddeb992.tar.gz mitmproxy-9dcd15d350aa5e2ee2d6f7299d0183cabddeb992.tar.bz2 mitmproxy-9dcd15d350aa5e2ee2d6f7299d0183cabddeb992.zip | |
asyncio: ditch the handler context
There are a few reasons for this. First, logs are now async, and can be called
at any time. Second, the event loop is thread local, so there can only ever be
one master per thread. These two things together completely obviate the need
for a handler context.
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/addons/test_script.py | 5 | ||||
| -rw-r--r-- | test/mitmproxy/proxy/protocol/test_websocket.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py index 17b1e372..3f0ce68c 100644 --- a/test/mitmproxy/addons/test_script.py +++ b/test/mitmproxy/addons/test_script.py @@ -180,11 +180,12 @@ class TestScriptLoader: 'recorder responseheaders', 'recorder response' ] - def test_script_run_nonexistent(self): + @pytest.mark.asyncio + async def test_script_run_nonexistent(self): sc = script.ScriptLoader() with taddons.context(sc) as tctx: sc.script_run([tflow.tflow(resp=True)], "/") - tctx.master.has_log("/: No such script") + assert await tctx.master.await_log("/: No such script") def test_simple(self): sc = script.ScriptLoader() diff --git a/test/mitmproxy/proxy/protocol/test_websocket.py b/test/mitmproxy/proxy/protocol/test_websocket.py index 347c0dfc..3ce1436a 100644 --- a/test/mitmproxy/proxy/protocol/test_websocket.py +++ b/test/mitmproxy/proxy/protocol/test_websocket.py @@ -47,6 +47,7 @@ class _WebSocketServerBase(net_tservers.ServerTestBase): class _WebSocketTestBase: + client = None @classmethod def setup_class(cls): |