diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-11-02 11:15:27 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 11:15:27 +1300 |
| commit | 490872ebefd87e9a55f2db3dd18c0fbb58dbf206 (patch) | |
| tree | 6fb39667fc63f620cc0e41838ca477b95beb5ad3 /test/pathod/test_language_websocket.py | |
| parent | ba09b8bff34869c3355e955d43e8e58e349a15ad (diff) | |
| parent | 59b269425f76258a5a68909ba7509597a7d74b3c (diff) | |
| download | mitmproxy-490872ebefd87e9a55f2db3dd18c0fbb58dbf206.tar.gz mitmproxy-490872ebefd87e9a55f2db3dd18c0fbb58dbf206.tar.bz2 mitmproxy-490872ebefd87e9a55f2db3dd18c0fbb58dbf206.zip | |
Merge pull request #1701 from cortesi/addontest2
Test suite cleanups
Diffstat (limited to 'test/pathod/test_language_websocket.py')
| -rw-r--r-- | test/pathod/test_language_websocket.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/pathod/test_language_websocket.py b/test/pathod/test_language_websocket.py index 49fbd4e6..e61413da 100644 --- a/test/pathod/test_language_websocket.py +++ b/test/pathod/test_language_websocket.py @@ -2,7 +2,8 @@ from pathod import language from pathod.language import websockets import mitmproxy.net.websockets -from . import tutils +from mitmproxy.test import tutils +from . import tservers def parse_request(s): @@ -62,7 +63,7 @@ class TestWebsocketFrame: def test_flags(self): wf = parse_request("wf:fin:mask:rsv1:rsv2:rsv3") - frm = mitmproxy.net.websockets.Frame.from_bytes(tutils.render(wf)) + frm = mitmproxy.net.websockets.Frame.from_bytes(tservers.render(wf)) assert frm.header.fin assert frm.header.mask assert frm.header.rsv1 @@ -70,7 +71,7 @@ class TestWebsocketFrame: assert frm.header.rsv3 wf = parse_request("wf:-fin:-mask:-rsv1:-rsv2:-rsv3") - frm = mitmproxy.net.websockets.Frame.from_bytes(tutils.render(wf)) + frm = mitmproxy.net.websockets.Frame.from_bytes(tservers.render(wf)) assert not frm.header.fin assert not frm.header.mask assert not frm.header.rsv1 @@ -80,7 +81,7 @@ class TestWebsocketFrame: def fr(self, spec, **kwargs): settings = language.base.Settings(**kwargs) wf = parse_request(spec) - return mitmproxy.net.websockets.Frame.from_bytes(tutils.render(wf, settings)) + return mitmproxy.net.websockets.Frame.from_bytes(tservers.render(wf, settings)) def test_construction(self): assert self.fr("wf:c1").header.opcode == 1 |