fix(connection): handle canceled tasks correctly (microsoft#624)

mxschmitt · web-flow · commit 9dee7b34e5bc · 2021-04-19T21:06:04.000+02:00
diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
@@ -220,6 +220,8 @@ def _dispatch(self, msg: ParsedMessagePayload) -> None:
         id = msg.get("id")
         if id:
             callback = self._callbacks.pop(id)
+            if callback.future.cancelled():
+                return
             error = msg.get("error")
             if error:
                 parsed_error = parse_error(error["error"])  # type: ignore
diff --git a/tests/async/test_issues.py b/tests/async/test_issues.py
@@ -12,8 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from asyncio import FIRST_COMPLETED, CancelledError, create_task, wait
+
 import pytest
 
+from playwright.async_api import Page
+
 
 @pytest.mark.only_browser("chromium")
 async def test_issue_189(browser_type, launch_arguments):
@@ -30,3 +34,21 @@ async def test_issue_195(playwright, browser):
     iphone_11 = playwright.devices["iPhone 11"]
     context = await browser.new_context(**iphone_11)
     await context.close()
+
+
+async def test_connection_task_cancel(page: Page):
+    await page.set_content("<input />")
+    done, pending = await wait(
+        {
+            create_task(page.wait_for_selector("input")),
+            create_task(page.wait_for_selector("#will-never-resolve")),
+        },
+        return_when=FIRST_COMPLETED,
+    )
+    assert len(done) == 1
+    assert len(pending) == 1
+    for task in pending:
+        task.cancel()
+        with pytest.raises(CancelledError):
+            await task
+    assert list(pending)[0].cancelled()
