aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-09-22 03:06:39 -0700
committerGitHub <noreply@github.com>2016-09-22 03:06:39 -0700
commit9142da1a7d6e87147a8ed92ae027d55ac935eb85 (patch)
treefe2eedd3367d4aac98f0e4b37ba69ddf172edc50 /test
parentd585236a820071938669d74b0069aab26f86ed5d (diff)
parent77868434e7dcaf42a7b48f3c81e04d1a7e993240 (diff)
downloadmitmproxy-9142da1a7d6e87147a8ed92ae027d55ac935eb85.tar.gz
mitmproxy-9142da1a7d6e87147a8ed92ae027d55ac935eb85.tar.bz2
mitmproxy-9142da1a7d6e87147a8ed92ae027d55ac935eb85.zip
Merge pull request #1566 from mhils/issue-1546
add websocket on/off switch, improve logging (fix #1546, fix #1547)
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/protocol/test_websockets.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/mitmproxy/protocol/test_websockets.py b/test/mitmproxy/protocol/test_websockets.py
index e7e2684f..e2361d89 100644
--- a/test/mitmproxy/protocol/test_websockets.py
+++ b/test/mitmproxy/protocol/test_websockets.py
@@ -65,7 +65,8 @@ class _WebSocketsTestBase(object):
opts = options.Options(
listen_port=0,
no_upstream_cert=False,
- ssl_insecure=True
+ ssl_insecure=True,
+ websockets=True,
)
opts.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy")
return opts