diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-05 13:03:26 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-05 13:03:26 +1300 |
| commit | 5da4099ddfee61b717c23a8c4227947ecc2f6c53 (patch) | |
| tree | bca7946d9fc0a95474a91764f5d84d741317ca08 /test | |
| parent | 96471fde1d8e860264d2b774775ca2a999d63eb8 (diff) | |
| download | mitmproxy-5da4099ddfee61b717c23a8c4227947ecc2f6c53.tar.gz mitmproxy-5da4099ddfee61b717c23a8c4227947ecc2f6c53.tar.bz2 mitmproxy-5da4099ddfee61b717c23a8c4227947ecc2f6c53.zip | |
Massage namespace to make room for client replay.
Mostly replay -> server_replay
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_dump.py | 6 | ||||
| -rw-r--r-- | test/test_flow.py | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index cfa690b1..0a42c8c3 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -36,7 +36,7 @@ class uDumpMaster(libpry.AutoTree): def test_replay(self): cs = StringIO() - o = dump.Options(replay="nonexistent", kill=True) + o = dump.Options(server_replay="nonexistent", kill=True) libpry.raises(dump.DumpError, dump.DumpMaster, None, o, None, outfile=cs) t = self.tmpdir() @@ -48,13 +48,13 @@ class uDumpMaster(libpry.AutoTree): fw.add(t) f.close() - o = dump.Options(replay=p, kill=True) + o = dump.Options(server_replay=p, kill=True) m = dump.DumpMaster(None, o, None, outfile=cs) self._cycle(m, "content") self._cycle(m, "content") - o = dump.Options(replay=p, kill=False) + o = dump.Options(server_replay=p, kill=False) m = dump.DumpMaster(None, o, None, outfile=cs) self._cycle(m, "nonexistent") diff --git a/test/test_flow.py b/test/test_flow.py index f9fb58e8..bd8c01a3 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -375,7 +375,7 @@ class uFlowMaster(libpry.AutoTree): err = proxy.Error(f.request, "msg") fm.handle_error(err) - def test_replay(self): + def test_server_playback(self): s = flow.State() f = utils.tflow() @@ -383,15 +383,21 @@ class uFlowMaster(libpry.AutoTree): pb = [f] fm = flow.FlowMaster(None, s) - assert not fm.do_playback(utils.tflow()) + assert not fm.do_server_playback(utils.tflow()) - fm.start_playback(pb, False, []) - assert fm.do_playback(utils.tflow()) + fm.start_server_playback(pb, False, []) + assert fm.do_server_playback(utils.tflow()) - fm.start_playback(pb, False, []) + fm.start_server_playback(pb, False, []) r = utils.tflow() r.request.content = "gibble" - assert not fm.do_playback(r) + assert not fm.do_server_playback(r) + + def test_client_playback(self): + s = flow.State() + fm = flow.FlowMaster(None, s) + pb = [utils.tflow_full()] + fm.start_client_playback(pb) def test_stickycookie(self): s = flow.State() @@ -424,5 +430,4 @@ tests = [ uState(), uSerialize(), uFlowMaster() - ] |