aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-18 16:16:40 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-18 16:16:40 +1200
commit274d0333f8bbd0bf88214747beeead991f36b72a (patch)
tree590d684d8ab9277cab441ffb07a79cc36412e4c7 /test/tutils.py
parent78cb5fe573ffcc06e700bb2193f9aef212be267e (diff)
parent408b4ffef0a784bea7ec08c252e757bca6e28134 (diff)
downloadmitmproxy-274d0333f8bbd0bf88214747beeead991f36b72a.tar.gz
mitmproxy-274d0333f8bbd0bf88214747beeead991f36b72a.tar.bz2
mitmproxy-274d0333f8bbd0bf88214747beeead991f36b72a.zip
Merge pull request #27 from Kriechi/http2-wip
HTTP/2: add initial support
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py
index c56c60d4..2184ade5 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -27,7 +27,7 @@ class DaemonTests(object):
klass.d = test.Daemon(
staticdir=test_data.path("data"),
anchors=[
- (re.compile("/anchor/.*"), language.parse_pathod("202:da"))
+ (re.compile("/anchor/.*"), "202:da")
],
ssl = klass.ssl,
ssloptions = so,
@@ -73,7 +73,8 @@ class DaemonTests(object):
timeout=None,
connect_to=None,
ssl=None,
- ws_read_limit=None
+ ws_read_limit=None,
+ use_http2=False,
):
"""
Returns a (messages, text log) tuple.
@@ -86,7 +87,8 @@ class DaemonTests(object):
ssl=ssl,
ws_read_limit=ws_read_limit,
timeout = timeout,
- fp = logfp
+ fp = logfp,
+ use_http2 = use_http2,
)
c.connect(connect_to)
ret = []