aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod/test_language_websocket.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-02-02 17:23:11 +0100
committerGitHub <noreply@github.com>2017-02-02 17:23:11 +0100
commit3f4d472c80f707b3ffbc060123d811c6bcae2afd (patch)
tree465ed866617e3d613078f1a682ff4eb5018c43f1 /test/pathod/test_language_websocket.py
parentc1bc1ea584d4bb47c1b754dfa7f10ab4dfc380a3 (diff)
parent4f0b2bc4dec4eb3c4f0075bcebebeb126a5a6e88 (diff)
downloadmitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.tar.gz
mitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.tar.bz2
mitmproxy-3f4d472c80f707b3ffbc060123d811c6bcae2afd.zip
Merge pull request #1980 from Kriechi/improve-tests
improve tests
Diffstat (limited to 'test/pathod/test_language_websocket.py')
-rw-r--r--test/pathod/test_language_websocket.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/test/pathod/test_language_websocket.py b/test/pathod/test_language_websocket.py
index e61413da..20f6a3a6 100644
--- a/test/pathod/test_language_websocket.py
+++ b/test/pathod/test_language_websocket.py
@@ -1,8 +1,9 @@
+import pytest
+
from pathod import language
from pathod.language import websockets
import mitmproxy.net.websockets
-from mitmproxy.test import tutils
from . import tservers
@@ -45,11 +46,8 @@ class TestWebsocketFrame:
def test_parse_websocket_frames(self):
wf = language.parse_websocket_frame("wf:x10")
assert len(list(wf)) == 10
- tutils.raises(
- language.ParseException,
- language.parse_websocket_frame,
- "wf:x"
- )
+ with pytest.raises(language.ParseException):
+ language.parse_websocket_frame("wf:x")
def test_client_values(self):
specs = [
@@ -132,7 +130,7 @@ class TestWebsocketFrame:
assert frm.payload == b"abc"
def test_knone(self):
- with tutils.raises("expected 4 bytes"):
+ with pytest.raises("expected 4 bytes"):
self.fr("wf:b'foo':mask:knone")
def test_length(self):
@@ -140,4 +138,5 @@ class TestWebsocketFrame:
frm = self.fr("wf:l2:b'foo'")
assert frm.header.payload_length == 2
assert frm.payload == b"fo"
- tutils.raises("expected 1024 bytes", self.fr, "wf:l1024:b'foo'")
+ with pytest.raises("expected 1024 bytes"):
+ self.fr("wf:l1024:b'foo'")