diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-02-20 13:29:41 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-02-20 13:29:41 +1300 |
| commit | 7ddba22f515aa8997da0b5ee36c8ebc9961493dd (patch) | |
| tree | def335c030b962ed5926b1b96d444a20408ed024 /test | |
| parent | c2ae8285f4bc092a449d92f4bbdb150d586c2c51 (diff) | |
| download | mitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.tar.gz mitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.tar.bz2 mitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.zip | |
Certificates are now generated in a temporary per-session directory.
This means that certificates don't accumulate in the conf directory, users
don't have to clear certificates if the CA is regenerated, and the user can
specify a custom CA without invalid certificates being loaded inadvertently.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flow.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index 168b4e74..7714ad97 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -47,12 +47,12 @@ class uFlow(libpry.AutoTree): assert f == flow.Flow.from_state(state) f.response = None - f.error = proxy.Error(f, "error") + f.error = proxy.Error(f.request, "error") state = f.get_state() assert f == flow.Flow.from_state(state) f2 = utils.tflow() - f2.error = proxy.Error(f, "e2") + f2.error = proxy.Error(f.request, "e2") assert not f == f2 f.load_state(f2.get_state()) assert f == f2 @@ -143,10 +143,10 @@ class uState(libpry.AutoTree): c = flow.State() req = utils.treq() f = c.add_request(req) - e = proxy.Error(f, "message") + e = proxy.Error(f.request, "message") assert c.add_error(e) - e = proxy.Error(utils.tflow(), "message") + e = proxy.Error(utils.tflow().request, "message") assert not c.add_error(e) def test_view(self): @@ -190,7 +190,7 @@ class uState(libpry.AutoTree): def _add_error(self, state): req = utils.treq() f = state.add_request(req) - f.error = proxy.Error(f, "msg") + f.error = proxy.Error(f.request, "msg") def test_kill_flow(self): c = flow.State() @@ -269,7 +269,7 @@ class uFlowMaster(libpry.AutoTree): dc = proxy.ClientDisconnect(req.client_conn) fm.handle_clientdisconnect(dc) - err = proxy.Error(f, "msg") + err = proxy.Error(f.request, "msg") fm.handle_error(err) |