aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-09 15:08:51 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-06-09 15:08:51 +1200
commit00c8bef0ff21794e622b7f442408e29c644b7002 (patch)
treefe016e005c73f7403a7a94f6ac8cc606cb838040 /libpathod
parent456b11df9a571e7f72570df1c5f6b4a59fd02c11 (diff)
downloadmitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.tar.gz
mitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.tar.bz2
mitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.zip
Port test suite over to Nose.
Diffstat (limited to 'libpathod')
-rw-r--r--libpathod/rparse.py4
-rw-r--r--libpathod/test.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/libpathod/rparse.py b/libpathod/rparse.py
index 87eff563..aa59d021 100644
--- a/libpathod/rparse.py
+++ b/libpathod/rparse.py
@@ -393,10 +393,8 @@ class Response:
def add_timeout(self, s, callback):
if TESTING:
callback()
- # begin nocover
- else:
+ else: # pragma: no cover
tornado.ioloop.IOLoop.instance().add_timeout(time.time() + s, callback)
- # end nocover
def write_values(self, fp, vals, actions, sofar=0, skip=0, blocksize=BLOCKSIZE):
while vals:
diff --git a/libpathod/test.py b/libpathod/test.py
index 508605bf..b7475bc9 100644
--- a/libpathod/test.py
+++ b/libpathod/test.py
@@ -1,6 +1,7 @@
import json, threading, Queue
import requests
import pathod, utils
+import tutils
IFACE = "127.0.0.1"