aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_language_websocket.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-21 23:03:45 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-21 23:03:45 +0200
commit2f670bac99943404952ebd5e76490e9643e50297 (patch)
treeb6b25128692be754084aa35c95191400ef592b95 /test/test_language_websocket.py
parent2da4aaf1ede8310bb14c22e82248002b97b5f3e5 (diff)
downloadmitmproxy-2f670bac99943404952ebd5e76490e9643e50297.tar.gz
mitmproxy-2f670bac99943404952ebd5e76490e9643e50297.tar.bz2
mitmproxy-2f670bac99943404952ebd5e76490e9643e50297.zip
fix tests, use pytest
We currently test with unparallelized builds, because there are apparently some race conditions in the test suite, which I can't trigger locally but happen on travis. Squashed commit of the following: commit 7dceb6dd3a1bdbc39688258bc4dff6eee685a33b Author: Maximilian Hils <git@maximilianhils.com> Date: Mon Sep 21 23:00:24 2015 +0200 disable parallelized tests commit fc0c3f12ee9259162e83026851362925d93b69f2 Author: Maximilian Hils <git@maximilianhils.com> Date: Mon Sep 21 22:49:19 2015 +0200 fix tests commit baba3ca5ef49bdbd7aad14f1bf0626738fa3d21c Author: Maximilian Hils <git@maximilianhils.com> Date: Mon Sep 21 22:28:20 2015 +0200 fix tests, use py.test
Diffstat (limited to 'test/test_language_websocket.py')
-rw-r--r--test/test_language_websocket.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/test/test_language_websocket.py b/test/test_language_websocket.py
index 8878f355..d98fd33e 100644
--- a/test/test_language_websocket.py
+++ b/test/test_language_websocket.py
@@ -131,11 +131,8 @@ class TestWebsocketFrame:
assert frm.payload == "abc"
def test_knone(self):
- tutils.raises(
- "expected 4 bytes",
- self.fr,
- "wf:b'foo':mask:knone",
- )
+ with tutils.raises("expected 4 bytes"):
+ self.fr("wf:b'foo':mask:knone")
def test_length(self):
assert self.fr("wf:l3:b'foo'").header.payload_length == 3