aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-04-17 10:18:45 +1200
committerGitHub <noreply@github.com>2018-04-17 10:18:45 +1200
commit14aa61b6b1d406d55a4819afab0c01eac6d1eafa (patch)
tree318d7c5720abcf975847ff2df9a3ec09f968bfce /test
parent754cb6cac9b1db56e2221fa379db014856a4725d (diff)
parentef4db528871c96a0304a2057d5f1ee8330ca6122 (diff)
downloadmitmproxy-14aa61b6b1d406d55a4819afab0c01eac6d1eafa.tar.gz
mitmproxy-14aa61b6b1d406d55a4819afab0c01eac6d1eafa.tar.bz2
mitmproxy-14aa61b6b1d406d55a4819afab0c01eac6d1eafa.zip
Merge pull request #3063 from cortesi/sigs
Ignore signal errors on windows + various fixes
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/tools/test_main.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/mitmproxy/tools/test_main.py b/test/mitmproxy/tools/test_main.py
index ba213733..57544276 100644
--- a/test/mitmproxy/tools/test_main.py
+++ b/test/mitmproxy/tools/test_main.py
@@ -1,18 +1,19 @@
import pytest
from mitmproxy.tools import main
+from mitmproxy import ctx
@pytest.mark.asyncio
async def test_mitmweb(event_loop):
- m = main.mitmweb([
+ main.mitmweb([
"--no-web-open-browser",
"-q", "-p", "0",
])
- await m._shutdown()
+ await ctx.master._shutdown()
@pytest.mark.asyncio
async def test_mitmdump():
- m = main.mitmdump(["-q", "-p", "0"])
- await m._shutdown()
+ main.mitmdump(["-q", "-p", "0"])
+ await ctx.master._shutdown()