diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-08-03 23:02:33 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-08-03 23:02:33 +1200 |
| commit | 0760607a7dd1ab6b904f618ecdda170cd042a21b (patch) | |
| tree | c618329cee105a456c774e4c015d7ef4a1b76571 /test | |
| parent | 9042d3f3b9ab96020dd314cdb9faeaae3947544c (diff) | |
| download | mitmproxy-0760607a7dd1ab6b904f618ecdda170cd042a21b.tar.gz mitmproxy-0760607a7dd1ab6b904f618ecdda170cd042a21b.tar.bz2 mitmproxy-0760607a7dd1ab6b904f618ecdda170cd042a21b.zip | |
Further interface cleaning.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flow.py | 10 | ||||
| -rw-r--r-- | test/tutils.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index 0cfcbc3c..4c4f7bf8 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -179,7 +179,7 @@ class uFlow(libpry.AutoTree): f.intercept() f.response = tutils.tresp() f.request = f.response.request - f.request.ack() + f.request._ack() assert not f.response.acked f.kill(fm) assert f.response.acked @@ -210,7 +210,7 @@ class uFlow(libpry.AutoTree): f.response = tutils.tresp() f.request = f.response.request f.intercept() - f.request.ack() + f.request._ack() assert not f.response.acked f.accept_intercept() assert f.response.acked @@ -411,7 +411,7 @@ class uSerialize(libpry.AutoTree): f2 = l[0] assert f2._get_state() == f._get_state() - assert f2.request.assemble() == f.request.assemble() + assert f2.request._assemble() == f.request._assemble() def test_load_flows(self): r = self._treader() @@ -575,7 +575,7 @@ class uRequest(libpry.AutoTree): assert r.set_url(u) assert not r.set_url("") assert r.url() == u - assert r.assemble() + assert r._assemble() r2 = r.copy() assert r == r2 @@ -653,7 +653,7 @@ class uResponse(libpry.AutoTree): c = flow.ClientConnect(("addr", 2222)) req = flow.Request(c, "host", 22, "https", "GET", "/", h, "content") resp = flow.Response(req, 200, "msg", h.copy(), "content") - assert resp.assemble() + assert resp._assemble() resp2 = resp.copy() assert resp2 == resp diff --git a/test/tutils.py b/test/tutils.py index a4c5b1fa..f7a49577 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -60,7 +60,7 @@ class TestMaster(controller.Master): def handle(self, m): self.log.append(m) - m.ack() + m._ack() class ProxyThread(threading.Thread): |