aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_pathod.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-11-18 09:04:49 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-11-18 09:04:49 +1300
commite40482576ca5b03f7c65332b8f1409366f7adbd9 (patch)
tree625904b72356835adbe19f79015ef97843a3fb5e /test/test_pathod.py
parentb11260f064ef6f2341d2b637f2e9a4dcc5b9f50c (diff)
downloadmitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.tar.gz
mitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.tar.bz2
mitmproxy-e40482576ca5b03f7c65332b8f1409366f7adbd9.zip
Add disconnect specifiers to test suite.
Fixes hangs seen in test suite with recent versions of requetss.
Diffstat (limited to 'test/test_pathod.py')
-rw-r--r--test/test_pathod.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_pathod.py b/test/test_pathod.py
index 46b1fb1d..70c9a5ec 100644
--- a/test/test_pathod.py
+++ b/test/test_pathod.py
@@ -7,10 +7,10 @@ class TestPathod:
def test_instantiation(self):
p = pathod.Pathod(
("127.0.0.1", 0),
- anchors = [(".*", "200")]
+ anchors = [(".*", "200:da")]
)
assert p.anchors
- tutils.raises("invalid regex", pathod.Pathod, ("127.0.0.1", 0), anchors=[("*", "200")])
+ tutils.raises("invalid regex", pathod.Pathod, ("127.0.0.1", 0), anchors=[("*", "200:da")])
tutils.raises("invalid page spec", pathod.Pathod, ("127.0.0.1", 0), anchors=[("foo", "bar")])
def test_logging(self):
@@ -30,16 +30,16 @@ class TestPathod:
class TestNoWeb(tutils.DaemonTests):
noweb = True
def test_noweb(self):
- assert self.get("200").status_code == 200
+ assert self.get("200:da").status_code == 200
assert self.getpath("/").status_code == 800
class TestTimeout(tutils.DaemonTests):
- timeout = 0.001
+ timeout = 0.00001
def test_noweb(self):
# FIXME: Add float values to spec language, reduce test timeout to
# increase test performance
- assert self.get("200:p1,1").status_code == 200
+ assert self.get("200:p1,2").status_code == 200
assert self.d.last_log()["type"] == "timeout"
@@ -89,7 +89,7 @@ class CommonTests(tutils.DaemonTests):
def test_logs(self):
assert self.d.clear_log()
tutils.raises("no requests logged", self.d.last_log)
- rsp = self.get("202")
+ rsp = self.get("202:da")
assert len(self.d.log()) == 1
assert self.d.clear_log()
assert len(self.d.log()) == 0