aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-02-04 05:02:17 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-02-04 05:02:17 +0100
commit6a53ae5fd37b516074f9bf46cffab015f6626b9e (patch)
tree4f20e3b51496900586ad11cd89094c6235facc8f /test/tutils.py
parentf6253a80fff2ed3a6f7846e866469c8776f1254d (diff)
downloadmitmproxy-6a53ae5fd37b516074f9bf46cffab015f6626b9e.tar.gz
mitmproxy-6a53ae5fd37b516074f9bf46cffab015f6626b9e.tar.bz2
mitmproxy-6a53ae5fd37b516074f9bf46cffab015f6626b9e.zip
push failing tests down to 43
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py
index 78bf5909..0d3b94f4 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -8,6 +8,7 @@ if os.name != "nt":
from netlib import certutils
from nose.plugins.skip import SkipTest
from mock import Mock
+from time import time
def _SkipWindows():
raise SkipTest("Skipped on Windows.")
@@ -19,17 +20,20 @@ def SkipWindows(fn):
def tclient_conn():
- return proxy.ClientConnection._from_state(dict(
+ c = proxy.ClientConnection._from_state(dict(
address=dict(address=("address", 22), use_ipv6=True),
clientcert=None
))
+ c.reply = controller.DummyReply()
+ return c
def tserver_conn():
- return proxy.ServerConnection._from_state(dict(
+ c = proxy.ServerConnection._from_state(dict(
address=dict(address=("address", 22), use_ipv6=True),
source_address=dict(address=("address", 22), use_ipv6=True),
cert=None
))
+ c.reply = controller.DummyReply()
def treq(conn=None, content="content"):
@@ -58,7 +62,7 @@ def tresp(req=None, content="message"):
address=dict(address=("address", 22), use_ipv6=True),
source_address=None,
cert=cert.to_pem()))
- f.response = http.HTTPResponse((1, 1), 200, "OK", headers, content, None, None)
+ f.response = http.HTTPResponse((1, 1), 200, "OK", headers, content, time(), time())
f.response.reply = controller.DummyReply()
return f.response