Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions playwright/_impl/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def send_message_to_server(
)
# Python: the next API call raises the error of an event listener, as the
# Python client always has; an unhandled rejection crashes Node.js.
if self._error and method != "__waitInfo__":
if self._error and method not in ("__waitInfo__", "close", "dispose"):
error = self._error
self._error = None
raise error
Expand Down Expand Up @@ -335,9 +335,13 @@ def dispatch(self, message: Dict[str, Any]) -> None:
callback.reject(parsed_error)
else:
validator = find_validator(callback.type, callback.method, "Result")
callback.resolve(
validator(result, "", self._validator_from_wire_context())
)
res = validator(result, "", self._validator_from_wire_context())
if self._error and callback.method == "close":
error = self._error
self._error = None
callback.reject(error)
else:
callback.resolve(res)
return

if debug_logger.is_enabled("channel"):
Expand Down
18 changes: 18 additions & 0 deletions tests/common/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,21 @@ def fail() -> None:
with browser.new_page() as page:
page.on("response", lambda _: fail())
page.goto(server.PREFIX + "/grid.html")


def test_event_error_does_not_prevent_browser_close(
browser_name: str, launch_arguments: Dict, server: Server
) -> None:
with sync_playwright() as p:
browser = p[browser_name].launch(**launch_arguments)
try:
page = browser.new_page()
page.on("response", lambda _: (_ for _ in ()).throw(ValueError("listener error")))
page.goto(server.PREFIX + "/grid.html")
finally:
try:
browser.close()
except ValueError:
pass
assert not browser.is_connected()