test: fix WebKit tests (#1328)

Author: mxschmitt

tests/async/test_interception.py

@@ -251,7 +251,7 @@ async def test_page_route_should_be_abortable_with_custom_error_codes(
     assert len(failed_requests) == 1
     failed_request = failed_requests[0]
     if is_webkit:
-        assert failed_request.failure == "Request intercepted"
+        assert failed_request.failure == "Blocked by Web Inspector"
     elif is_firefox:
         assert failed_request.failure == "NS_ERROR_OFFLINE"
     else:
@@ -277,7 +277,7 @@ async def test_page_route_should_fail_navigation_when_aborting_main_resource(
         await page.goto(server.EMPTY_PAGE)
     assert exc
     if is_webkit:
-        assert "Request intercepted" in exc.value.message
+        assert "Blocked by Web Inspector" in exc.value.message
     elif is_firefox:
         assert "NS_ERROR_FAILURE" in exc.value.message
     else:

tests/async/test_websocket.py

@@ -85,15 +85,17 @@ def on_web_socket(ws):
 
 
 async def test_should_emit_binary_frame_events(page, ws_server):
+    done_task = asyncio.Future()
     sent = []
     received = []
 
     def on_web_socket(ws):
         ws.on("framesent", lambda payload: sent.append(payload))
         ws.on("framereceived", lambda payload: received.append(payload))
+        ws.on("close", lambda: done_task.set_result(None))
 
     page.on("websocket", on_web_socket)
-    async with page.expect_event("websocket") as ws_info:
+    async with page.expect_event("websocket"):
         await page.evaluate(
             """port => {
             const ws = new WebSocket('ws://localhost:' + port + '/ws');
@@ -107,9 +109,7 @@ def on_web_socket(ws):
         }""",
             ws_server.PORT,
         )
-    ws = await ws_info.value
-    if not ws.is_closed():
-        await ws.wait_for_event("close")
+    await done_task
     assert sent == [b"\x00\x01\x02\x03\x04", "echo-bin"]
     assert received == ["incoming", b"\x04\x02"]