aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-11 10:57:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-11 10:57:32 +0200
commitf3a611339148a5a3de141ff1234ec9018ab20896 (patch)
tree5c53dc5d5eb8a06d1caaed84b04fd137cdbee6a1 /netlib/tutils.py
parentc2832ef72bd4eed485a1c8d4bcb732da69896444 (diff)
parent6a30ad2ad236fa20d086e271ff962ebc907da027 (diff)
downloadmitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.tar.gz
mitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.tar.bz2
mitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.zip
Merge pull request #85 from Kriechi/http2-wip
add move tests and code from mitmproxy
Diffstat (limited to 'netlib/tutils.py')
-rw-r--r--netlib/tutils.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/netlib/tutils.py b/netlib/tutils.py
index 5018b9e8..7434c108 100644
--- a/netlib/tutils.py
+++ b/netlib/tutils.py
@@ -69,8 +69,6 @@ def raises(exc, obj, *args, **kwargs):
test_data = utils.Data(__name__)
-
-
def treq(content="content", scheme="http", host="address", port=22):
"""
@return: libmproxy.protocol.http.HTTPRequest
@@ -119,7 +117,7 @@ def tresp(content="message"):
"OK",
headers,
content,
- time.time(),
- time.time(),
+ timestamp_start=time.time(),
+ timestamp_end=time.time(),
)
return resp