diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-13 14:20:34 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-13 14:20:34 +1300 |
| commit | 069aca1df4223416bc76883c37078e9f2deef28f (patch) | |
| tree | aefe259a2e4e2a912f15651e0aa608d1fc8acfa6 /test | |
| parent | 4f69eef8f310b87a45782b8d097dd148e815486a (diff) | |
| download | mitmproxy-069aca1df4223416bc76883c37078e9f2deef28f.tar.gz mitmproxy-069aca1df4223416bc76883c37078e9f2deef28f.tar.bz2 mitmproxy-069aca1df4223416bc76883c37078e9f2deef28f.zip | |
Deprecate Flow.unload_script in favor of Flow.unload_scripts
In the presence of arguments, unloading a single script is clumsy and
less useful.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flow.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index 680d59e5..f9198f0c 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -565,8 +565,7 @@ class TestFlowMaster: fm = flow.FlowMaster(None, s) assert not fm.load_script(tutils.test_data.path("scripts/a.py")) assert not fm.load_script(tutils.test_data.path("scripts/a.py")) - assert not fm.unload_script(fm.scripts[0]) - assert not fm.unload_script(fm.scripts[0]) + assert not fm.unload_scripts() assert fm.load_script("nonexistent") assert "ValueError" in fm.load_script(tutils.test_data.path("scripts/starterr.py")) assert len(fm.scripts) == 0 @@ -613,9 +612,13 @@ class TestFlowMaster: fm.handle_clientdisconnect(dc) assert fm.scripts[0].ns["log"][-1] == "clientdisconnect" assert fm.scripts[1].ns["log"][-1] == "clientdisconnect" + + #unload first script - fm.unload_script(fm.scripts[0]) - assert len(fm.scripts) == 1 + fm.unload_scripts() + assert len(fm.scripts) == 0 + + assert not fm.load_script(tutils.test_data.path("scripts/all.py")) err = flow.Error(f.request, "msg") err.reply = controller.DummyReply() fm.handle_error(err) |