aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-05-12 13:32:57 +1200
committerGitHub <noreply@github.com>2018-05-12 13:32:57 +1200
commit2db0245233c272ad9edd0a7710396c38e7c3097d (patch)
treeb569e47d9abf6d3f68b54c2f1e13bd08d39088be /test
parent45c435592fef8419c12ffe8c7152fbfa4e04144d (diff)
parent94428b2ffdcb5780a7a12373472b6a21eb9fd83e (diff)
downloadmitmproxy-2db0245233c272ad9edd0a7710396c38e7c3097d.tar.gz
mitmproxy-2db0245233c272ad9edd0a7710396c38e7c3097d.tar.bz2
mitmproxy-2db0245233c272ad9edd0a7710396c38e7c3097d.zip
Merge pull request #3116 from cortesi/fixes
Misc fixes
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_script.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py
index 573b36e7..05472d9a 100644
--- a/test/mitmproxy/addons/test_script.py
+++ b/test/mitmproxy/addons/test_script.py
@@ -173,16 +173,14 @@ class TestCutTraceback:
class TestScriptLoader:
@pytest.mark.asyncio
async def test_script_run(self, tdata):
- rp = tdata.path(
- "mitmproxy/data/addonscripts/recorder/recorder.py"
- )
+ rp = tdata.path("mitmproxy/data/addonscripts/recorder/recorder.py")
sc = script.ScriptLoader()
with taddons.context(sc) as tctx:
sc.script_run([tflow.tflow(resp=True)], rp)
await tctx.master.await_log("recorder response")
debug = [i.msg for i in tctx.master.logs if i.level == "debug"]
assert debug == [
- 'recorder load', 'recorder running', 'recorder configure',
+ 'recorder running', 'recorder configure',
'recorder requestheaders', 'recorder request',
'recorder responseheaders', 'recorder response'
]
@@ -192,7 +190,7 @@ class TestScriptLoader:
sc = script.ScriptLoader()
with taddons.context(sc) as tctx:
sc.script_run([tflow.tflow(resp=True)], "/")
- assert await tctx.master.await_log("/: No such script")
+ assert await tctx.master.await_log("No such script")
def test_simple(self, tdata):
sc = script.ScriptLoader()