aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_server.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-07-09 10:58:28 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-07-09 10:58:28 +1200
commite49c920d161fcd1a4bc75ba981ffabd188dd0f00 (patch)
tree62789f7021027bc0b5ed59c0e55fed8009d4819d /test/test_server.py
parent3749d52b66d7db47188459c36d316136fee5f317 (diff)
downloadmitmproxy-e49c920d161fcd1a4bc75ba981ffabd188dd0f00.tar.gz
mitmproxy-e49c920d161fcd1a4bc75ba981ffabd188dd0f00.tar.bz2
mitmproxy-e49c920d161fcd1a4bc75ba981ffabd188dd0f00.zip
Refator server tests to use flow.FlowMaster and flow.State
Diffstat (limited to 'test/test_server.py')
-rw-r--r--test/test_server.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test_server.py b/test/test_server.py
index 1f83c496..87996c43 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -15,7 +15,7 @@ import tutils
class SanityMixin:
def test_http(self):
assert self.pathod("304").status_code == 304
- assert self.log()
+ assert self.master.state.view
def test_large(self):
assert len(self.pathod("200:b@50k").content) == 1024*50
@@ -54,7 +54,7 @@ class TestProxy(tutils.HTTPProxTest):
f = self.pathod("304")
assert f.status_code == 304
- l = self.log()
- assert l[1].address
- assert "host" in l[2].headers
- assert l[3].code == 304
+ l = self.master.state.view[0]
+ assert l.request.client_conn.address
+ assert "host" in l.request.headers
+ assert l.response.code == 304