diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-18 11:29:07 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-18 11:29:51 +1300 |
commit | 825b02d495ef762f22b44d48ed9d923f8c54220a (patch) | |
tree | aa7acbba4e317a899c0d035023ebd3c250d73672 /test | |
parent | b25d94a6ac77ec789076b148be31bc99ad74616c (diff) | |
download | mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.tar.gz mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.tar.bz2 mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.zip |
master.duplicate_flow -> state.duplicate_flow
This is a pure operation on state, and doesn't belong on master.
Part of prep to move state to an addon.
Diffstat (limited to 'test')
-rw-r--r-- | test/mitmproxy/data/addonscripts/duplicate_flow.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/test_flow.py | 11 | ||||
-rw-r--r-- | test/mitmproxy/test_flow_state.py | 15 |
3 files changed, 16 insertions, 12 deletions
diff --git a/test/mitmproxy/data/addonscripts/duplicate_flow.py b/test/mitmproxy/data/addonscripts/duplicate_flow.py index b466423c..02fb8dce 100644 --- a/test/mitmproxy/data/addonscripts/duplicate_flow.py +++ b/test/mitmproxy/data/addonscripts/duplicate_flow.py @@ -2,5 +2,5 @@ from mitmproxy import ctx def request(flow): - f = ctx.master.duplicate_flow(flow) + f = ctx.master.state.duplicate_flow(flow) ctx.master.replay_request(f, block=True) diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 38d61afe..90b9b61d 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -452,17 +452,6 @@ class TestFlowMaster: f.live = True tutils.raises("live", fm.replay_request, f) - def test_duplicate_flow(self): - s = flow.State() - fm = flow.FlowMaster(None, None, s) - f = tutils.tflow(resp=True) - fm.load_flow(f) - assert s.flow_count() == 1 - f2 = fm.duplicate_flow(f) - assert f2.response - assert s.flow_count() == 2 - assert s.index(f2) == 1 - def test_create_flow(self): s = flow.State() fm = flow.FlowMaster(None, None, s) diff --git a/test/mitmproxy/test_flow_state.py b/test/mitmproxy/test_flow_state.py new file mode 100644 index 00000000..cc05537d --- /dev/null +++ b/test/mitmproxy/test_flow_state.py @@ -0,0 +1,15 @@ +from mitmproxy import flow +from . import tutils + + +class TestState: + def test_duplicate_flow(self): + s = flow.State() + fm = flow.FlowMaster(None, None, s) + f = tutils.tflow(resp=True) + fm.load_flow(f) + assert s.flow_count() == 1 + f2 = fm.state.duplicate_flow(f) + assert f2.response + assert s.flow_count() == 2 + assert s.index(f2) == 1 |