sadym-chromium · sadym-chromium · Feb 13, 2024 · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/console/console-log-logged.html b/console/console-log-logged.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test console log are present</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script>
+ promise_test(async () => {
+ const some_message = "SOME MESSAGE";
+ // Subscribe to log.entryAdded BiDi events.
+ await test_driver.bidi.session.subscribe("log.entryAdded");
+ // Add a listener for the log.entryAdded event.
+ const log_entry_promise = test_driver.bidi.log.entryAdded.once();
+ // Emit a console.log message.
+ console.log(some_message)
+ // Wait for the log.entryAdded event to be received.
+ const event = await log_entry_promise;
+ // Assert the log.entryAdded event has the expected message.
+ const data = event.data;
+ assert_equals(data.args.length, 1);
+ const event_message = data.args[0];
+ assert_equals(event_message.value, some_message);
+ }, "Assert log event are logged");
+</script>
diff --git a/resources/testdriver.js b/resources/testdriver.js
@@ -44,11 +44,72 @@
  return pointerInteractablePaintTree.indexOf(element) !== -1;
  }
 
-
  /**
  * @namespace {test_driver}
  */
  window.test_driver = {
+ /**
+ * @namespace {bidi} - Represents `WebDriver BiDi <https://w3c.github.io/webdriver-bidi>`_ protocol.
+ */
+ bidi: {
+ /**
+ * `session <https://w3c.github.io/webdriver-bidi/#module-session>`_ module.
+ */
+ session: {
+ /**
+ * Subscribe to event.
+ *
+ * Events will be Matches the behaviour of the `session.subscribe
+ * <https://w3c.github.io/webdriver-bidi/#command-session-subscribe>`_ WebDriver BiDi command.
+ *
+ * @param {String} event - The event to subscribe to.
+ * @param {WindowProxy} context - Browsing context in which
+ * to run the call, or null for the current
+ * browsing context.
+ * @return {Promise<never>}
+ */
+ subscribe: function (event, context = null) {
+ return window.test_driver_internal.bidi.session.subscribe(event, context);
+ }
+ },
+ /**
+ * `log <https://w3c.github.io/webdriver-bidi/#module-log>`_ module.
+ */
+ log: {
+ /**
+ * `log.entryAdded <https://w3c.github.io/webdriver-bidi/#event-log-entryAdded>`_ event.
+ */
+ entryAdded: {
+ /**
+ * Add an event listener for the `log.entryAdded
+ * <https://w3c.github.io/webdriver-bidi/#event-log-entryAdded>`_ event.
+ *
+ * @param callback {function(event): void} - The callback to call when the event is fired.
+ * @returns {function(): void} - A function to call to remove the event listener.
+ */
+ on: function (callback) {
+ return window.test_driver_internal.bidi.log.entryAdded.on(callback);
+ },
+ /**
+ * Get a promise that resolves the next time the `log.entryAdded
+ * <https://w3c.github.io/webdriver-bidi/#event-log-entryAdded>`_ event is fired.
+ *
+ * @returns {Promise<Object>}
+ */
+ once: function () {
+ return new Promise((resolve) => {
+ const remove_handle = window.test_driver_internal.bidi.log.entryAdded.on(
+ (event) => {
+ remove_handle();
+ resolve(event);
+ }
+ );
+ });
+ },
+ }
+ }
+ },
+
  /**
  * Set the context in which testharness.js is loaded
  *
@@ -1023,7 +1084,7 @@
  */
  get_virtual_sensor_information: function(sensor_type, context=null) {
  return window.test_driver_internal.get_virtual_sensor_information(sensor_type, context);
- }
+ },
  };
 
  window.test_driver_internal = {
@@ -1035,6 +1096,21 @@
  */
  in_automation: false,
 
+ bidi: {
+ session: {
+ subscribe(event, context=null) {
+ throw new Error("subscribe() is not implemented by testdriver-vendor.js");
+ },
+ },
+ log: {
+ entryAdded: {
+ on: function () {
+ throw new Error("bidi.log.entryAdded.on is not implemented by testdriver-vendor.js");
+ }
+ }
+ }
+ },
+
  async click(element, coords) {
  if (this.in_automation) {
  throw new Error("click() is not implemented by testdriver-vendor.js");

diff --git a/tools/wptrunner/wptrunner/executors/actions.py b/tools/wptrunner/wptrunner/executors/actions.py
@@ -14,6 +14,18 @@ def __call__(self, payload):
  self.protocol.click.element(element)
 
 
+class BidiSessionSubscribeAction:
+ name = "bidi.session.subscribe"
+
+ def __init__(self, logger, protocol):
+ self.logger = logger
+ self.protocol = protocol
+
+ def __call__(self, payload):
+ self.logger.debug("Subscribing to event: %s" % payload["event"])
+ return self.protocol.events.subscribe(payload["event"])
+
+
 class DeleteAllCookiesAction:
  name = "delete_all_cookies"
 
@@ -477,4 +489,5 @@ def __call__(self, payload):
  CreateVirtualSensorAction,
  UpdateVirtualSensorAction,
  RemoveVirtualSensorAction,
- GetVirtualSensorInformationAction]
+ GetVirtualSensorInformationAction,
+ BidiSessionSubscribeAction]
diff --git a/tools/wptrunner/wptrunner/executors/base.py b/tools/wptrunner/wptrunner/executors/base.py
@@ -1,5 +1,6 @@
 # mypy: allow-untyped-defs
 
+import asyncio
 import base64
 import hashlib
 import io
@@ -755,7 +756,7 @@ def process_action(self, url, payload):
  try:
  with ActionContext(self.logger, self.protocol, payload.get("context")):
  try:
- result = action_handler(payload)
+ maybe_coroutine_result = action_handler(payload)
  except AttributeError as e:
  # If we fail to get an attribute from the protocol presumably that's a
  # ProtocolPart we don't implement
@@ -776,8 +777,22 @@ def process_action(self, url, payload):
  self._send_message(cmd_id, "complete", "error")
  raise
  else:
- self.logger.debug(f"Action {action} completed with result {result}")
- return_message = {"result": result}
+ if asyncio.iscoroutine(maybe_coroutine_result):
+ async def awaited_result_coroutine():
+ """
+ In case of the action_handler returning a coroutine, we need to await for its result and return a
+ coroutine with the result to be awaited by the caller.
+ """
+ self.logger.debug(f"Action '{action}' is a coroutine. Waiting for result.")
+ awaited_result = await maybe_coroutine_result
+ self.logger.debug(f"Action {action} completed with result {awaited_result}")
+ self._send_message(cmd_id, "complete", "success", json.dumps({"result": awaited_result}))
+ return False, None
+
+ return awaited_result_coroutine()
+
+ self.logger.debug(f"Action {action} completed with result {maybe_coroutine_result}")
+ return_message = {"result": maybe_coroutine_result}
  self._send_message(cmd_id, "complete", "success", json.dumps(return_message))
 
  return False, None

diff --git a/tools/wptrunner/wptrunner/executors/executorchrome.py b/tools/wptrunner/wptrunner/executors/executorchrome.py
@@ -16,6 +16,7 @@
 from .executorwebdriver import (
  WebDriverCrashtestExecutor,
  WebDriverFedCMProtocolPart,
+ WebDriverBidiProtocol,
  WebDriverProtocol,
  WebDriverRefTestExecutor,
  WebDriverRun,
@@ -202,12 +203,12 @@ def confirm_idp_login(self):
  self.fedcm_company_prefix + "/fedcm/confirmidplogin")
 
 
-class ChromeDriverProtocol(WebDriverProtocol):
+class ChromeDriverProtocol(WebDriverBidiProtocol):
  implements = [
  ChromeDriverFedCMProtocolPart,
  ChromeDriverPrintProtocolPart,
  ChromeDriverTestharnessProtocolPart,
- *(part for part in WebDriverProtocol.implements
+ *(part for part in WebDriverBidiProtocol.implements
  if part.name != ChromeDriverTestharnessProtocolPart.name and
  part.name != ChromeDriverFedCMProtocolPart.name)
  ]