aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 11:41:30 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 11:41:30 +0100
commitec087a1960bdcfff5d8207a8090f35223b02fd49 (patch)
treeea0f24bb4d8d655a9f982ff5e5cd2c36d5c10f4e /test/tutils.py
parentcd744592f6dfebf9ba00ce8a35828b49fec1af5c (diff)
parentbdb763d9cff75eec4bb44d23bfc2ef6fa4871bcc (diff)
downloadmitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.tar.gz
mitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.tar.bz2
mitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.zip
Merge pull request #921 from mitmproxy/model-cleanup
Model Cleanup
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py
index 5bd91307..2ce0884d 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -76,7 +76,11 @@ def tclient_conn():
"""
c = ClientConnection.from_state(dict(
address=dict(address=("address", 22), use_ipv6=True),
- clientcert=None
+ clientcert=None,
+ ssl_established=False,
+ timestamp_start=1,
+ timestamp_ssl_setup=2,
+ timestamp_end=3,
))
c.reply = controller.DummyReply()
return c
@@ -88,9 +92,15 @@ def tserver_conn():
"""
c = ServerConnection.from_state(dict(
address=dict(address=("address", 22), use_ipv6=True),
- state=[],
source_address=dict(address=("address", 22), use_ipv6=True),
- cert=None
+ cert=None,
+ timestamp_start=1,
+ timestamp_tcp_setup=2,
+ timestamp_ssl_setup=3,
+ timestamp_end=4,
+ ssl_established=False,
+ sni="address",
+ via=None
))
c.reply = controller.DummyReply()
return c