aboutsummaryrefslogtreecommitdiffstats
path: root/test/mitmproxy/proxy/protocol/test_websocket.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/mitmproxy/proxy/protocol/test_websocket.py')
-rw-r--r--test/mitmproxy/proxy/protocol/test_websocket.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/test/mitmproxy/proxy/protocol/test_websocket.py b/test/mitmproxy/proxy/protocol/test_websocket.py
index e5ed8e9d..352a9c0d 100644
--- a/test/mitmproxy/proxy/protocol/test_websocket.py
+++ b/test/mitmproxy/proxy/protocol/test_websocket.py
@@ -3,7 +3,6 @@ import os
import struct
import tempfile
import traceback
-import time
from mitmproxy import options
from mitmproxy import exceptions
@@ -314,7 +313,8 @@ class TestPong(_WebSocketTest):
wfile.flush()
websockets.Frame.from_file(rfile)
- def test_pong(self):
+ @pytest.mark.asyncio
+ async def test_pong(self):
self.setup_connection()
self.client.wfile.write(bytes(websockets.Frame(fin=1, mask=1, opcode=websockets.OPCODE.PING, payload=b'foobar')))
@@ -327,12 +327,7 @@ class TestPong(_WebSocketTest):
assert frame.header.opcode == websockets.OPCODE.PONG
assert frame.payload == b'foobar'
- for i in range(20):
- if self.master.has_log("Pong Received from server", "info"):
- break
- time.sleep(0.01)
- else:
- raise AssertionError("No pong seen")
+ assert await self.master.await_log("pong received")
class TestClose(_WebSocketTest):