alice
diff --git a/‎Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py
Lines changed: 1 addition & 1 deletion b/‎Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎WebDriverTests/imported/w3c/importer.json
Lines changed: 1 addition & 1 deletion b/‎WebDriverTests/imported/w3c/importer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/__init__.py
Lines changed: 3 additions & 3 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/__init__.py
Lines changed: 3 additions & 3 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/__init__.py
Lines changed: 1 addition & 0 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/__init__.py
Lines changed: 1 addition & 0 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/client.py
Lines changed: 6 additions & 5 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/client.py
Lines changed: 6 additions & 5 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/error.py
Lines changed: 14 additions & 2 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/error.py
Lines changed: 14 additions & 2 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/__init__.py
Lines changed: 1 addition & 0 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/__init__.py
Lines changed: 1 addition & 0 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/bluetooth.py
Lines changed: 21 additions & 0 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/bluetooth.py
Lines changed: 21 additions & 0 deletions
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/browser.py
Lines changed: 54 additions & 1 deletion b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/browser.py
Lines changed: 54 additions & 1 deletion
diff --git a/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/browsing_context.py
Lines changed: 9 additions & 10 deletions b/‎WebDriverTests/imported/w3c/tools/webdriver/webdriver/bidi/modules/browsing_context.py
Lines changed: 9 additions & 10 deletions
@@ -134,7 +134,7 @@ def __init__(self, driver, server, env, timeout, expectations):
                          'doc_root': server.document_root()}
         self.runner = TestRunner()
         browser = WebKitDriverBrowser(self.runner.logger, webdriver_binary=driver.binary_path())
-        WdspecExecutor.__init__(self, self.runner.logger, browser, server_config, driver.binary_path(), None, capabilities=driver.capabilities())
+        WdspecExecutor.__init__(self, self.runner.logger, browser, server_config, driver.binary_path(), None, capabilities=driver.capabilities(), target_platform=None)
 
         self._timeout = timeout
         self._expectations = expectations
 
@@ -1,6 +1,6 @@
 {
     "repository": "https://github.com/w3c/web-platform-tests.git",
-    "revision": "097898330ea0759bf785b4e01965e7790bec9bf5",
+    "revision": "da531cba2698417ff5922863e334909a013fce91",
     "paths_to_import": [
         "tools/webdriver",
         "tools/wptrunner",
 
@@ -35,6 +35,6 @@
     UnknownErrorException,
     UnknownMethodException,
     UnsupportedOperationException,
-    WebDriverException)
-from .bidi import (
-    BidiSession)
+    WebDriverException,
+)
+from .bidi import BidiSession, BidiWindow
@@ -1,3 +1,4 @@
 # flake8: noqa
 
 from .client import BidiSession
+from .protocol import BidiWindow
@@ -90,6 +90,7 @@ def __init__(self,
 
         # Modules.
         # For each module, have a property representing that module
+        self.bluetooth = modules.Bluetooth(self)
         self.browser = modules.Browser(self)
         self.browsing_context = modules.BrowsingContext(self)
         self.input = modules.Input(self)
@@ -127,7 +128,7 @@ def bidi_only(cls,
                   requested_capabilities: Optional[Mapping[str, Any]] = None) -> "BidiSession":
         """Create a BiDi session where there is no existing HTTP session
 
-        :param webdocket_url: URL to the WebSocket server listening for BiDi connections
+        :param websocket_url: URL to the WebSocket server listening for BiDi connections
         :param requested_capabilities: Capabilities request for establishing the session."""
         return cls(websocket_url, requested_capabilities=requested_capabilities)
 
@@ -205,15 +206,15 @@ async def on_message(self, data: Mapping[str, Any]) -> None:
             if not listeners:
                 listeners = self.event_listeners.get(None, [])
             for listener in listeners:
-                await listener(data["method"], data["params"])
+                asyncio.create_task(listener(data["method"], data["params"]))
         else:
             raise ValueError(f"Unexpected message: {data!r}")
 
     async def end(self) -> None:
         """Close websocket connection."""
-        assert self.transport is not None
-        await self.transport.end()
-        self.transport = None
+        if self.transport is not None:
+            await self.transport.end()
+            self.transport = None
 
     def add_event_listener(
         self,
 
@@ -12,14 +12,14 @@ class BidiException(Exception):
     error_code: ClassVar[str]
 
     def __init__(self, message: str, stacktrace: Optional[str] = None):
-        super()
+        super().__init__()
 
         self.message = message
         self.stacktrace = stacktrace
 
     def __repr__(self):
         """Return the object representation in string format."""
-        return f"{self.__class__.__name__}({self.error}, {self.message}, {self.stacktrace})"
+        return f"{self.__class__.__name__}({self.error_code}, {self.message}, {self.stacktrace})"
 
     def __str__(self):
         """Return the string representation of the object."""
@@ -83,6 +83,10 @@ class NoSuchScriptException(BidiException):
     error_code = "no such script"
 
 
+class NoSuchUserContextException(BidiException):
+    error_code = "no such user context"
+
+
 class UnableToCaptureScreenException(BidiException):
     error_code = "unable to capture screen"
 
@@ -91,6 +95,14 @@ class UnableToSetCookieException(BidiException):
     error_code = "unable to set cookie"
 
 
+class UnableToSetFileInputException(BidiException):
+    error_code = "unable to set file input"
+
+
+class UnderspecifiedStoragePartitionException(BidiException):
+    error_code = "underspecified storage partition"
+
+
 class UnknownCommandException(BidiException):
     error_code = "unknown command"
 
 
@@ -1,5 +1,6 @@
 # flake8: noqa
 
+from .bluetooth import Bluetooth
 from .browser import Browser
 from .browsing_context import BrowsingContext
 from .input import Input
 
@@ -0,0 +1,21 @@
+from typing import Any, Mapping
+
+from ._module import BidiModule, command
+
+
+class Bluetooth(BidiModule):
+    """
+    Represents bluetooth automation module specified in
+    https://webbluetoothcg.github.io/web-bluetooth/#automated-testing
+    """
+
+    @command
+    def simulate_adapter(self, context: str, state: str) -> Mapping[str, Any]:
+        """
+        Represents a command `bluetooth.simulateAdapter` specified in
+        https://webbluetoothcg.github.io/web-bluetooth/#bluetooth-simulateAdapter-command
+        """
+        return {
+            "context": context,
+            "state": state
+        }
@@ -1,4 +1,4 @@
-from typing import Any, Mapping
+from typing import Any, Mapping, MutableMapping
 
 from ._module import BidiModule, command
 
@@ -7,3 +7,56 @@ class Browser(BidiModule):
     @command
     def close(self) -> Mapping[str, Any]:
         return {}
+
+    @command
+    def get_client_windows(self) -> Mapping[str, Any]:
+        return {}
+
+    @get_client_windows.result
+    def _get_client_windows(self, result: Mapping[str, Any]) -> Any:
+        assert result['clientWindows'] is not None
+        assert isinstance(result["clientWindows"], list)
+        for client_window_info in result["clientWindows"]:
+            assert isinstance(client_window_info["active"], bool)
+            assert isinstance(client_window_info["clientWindow"], str)
+            assert isinstance(client_window_info["state"], str)
+            assert isinstance(client_window_info["height"], int)
+            assert isinstance(client_window_info["width"], int)
+            assert isinstance(client_window_info["x"], int)
+            assert isinstance(client_window_info["y"], int)
+        return result["clientWindows"]
+
+    @command
+    def create_user_context(self) -> Mapping[str, Any]:
+        return {}
+
+    @create_user_context.result
+    def _create_user_context(self, result: Mapping[str, Any]) -> Any:
+        assert result["userContext"] is not None
+        assert isinstance(result["userContext"], str)
+
+        return result["userContext"]
+
+    @command
+    def get_user_contexts(self) -> Mapping[str, Any]:
+        return {}
+
+    @get_user_contexts.result
+    def _get_user_contexts(self, result: Mapping[str, Any]) -> Any:
+        assert result["userContexts"] is not None
+        assert isinstance(result["userContexts"], list)
+        for user_context_info in result["userContexts"]:
+            assert isinstance(user_context_info["userContext"], str)
+
+        return result["userContexts"]
+
+    @command
+    def remove_user_context(
+        self, user_context: str
+    ) -> Mapping[str, Any]:
+        params: MutableMapping[str, Any] = {}
+
+        if user_context is not None:
+            params["userContext"] = user_context
+
+        return params
@@ -3,11 +3,10 @@
 from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Union
 
 from ._module import BidiModule, command
-from .script import OwnershipModel, SerializationOptions
+from .script import SerializationOptions
 from ..undefined import UNDEFINED, Undefined
 
 
-
 class ElementOptions(Dict[str, Any]):
     def __init__(self, element: Mapping[str, Any]):
         self["type"] = "element"
@@ -69,19 +68,22 @@ def _capture_screenshot(self, result: Mapping[str, Any]) -> bytes:
         return base64.b64decode(result["data"])
 
     @command
-    def close(self, context: Optional[str] = None) -> Mapping[str, Any]:
+    def close(self, context: Optional[str] = None, prompt_unload: Optional[bool] = None) -> Mapping[str, Any]:
         params: MutableMapping[str, Any] = {}
 
         if context is not None:
             params["context"] = context
+        if prompt_unload is not None:
+            params["promptUnload"] = prompt_unload
 
         return params
 
     @command
     def create(self,
                type_hint: str,
                reference_context: Optional[str] = None,
-               background: Optional[bool] = None) -> Mapping[str, Any]:
+               background: Optional[bool] = None,
+               user_context: Optional[str] = None) -> Mapping[str, Any]:
         params: MutableMapping[str, Any] = {"type": type_hint}
 
         if reference_context is not None:
@@ -90,6 +92,9 @@ def create(self,
         if background is not None:
             params["background"] = background
 
+        if user_context is not None:
+            params["userContext"] = user_context
+
         return params
 
     @create.result
@@ -136,17 +141,11 @@ def locate_nodes(self,
                      context: str,
                      locator: Mapping[str, Any],
                      max_node_count: Optional[int] = None,
-                     ownership: Optional[OwnershipModel] = None,
-                     sandbox: Optional[str] = None,
                      serialization_options: Optional[SerializationOptions] = None,
                      start_nodes: Optional[List[Mapping[str, Any]]] = None) -> Mapping[str, Any]:
         params: MutableMapping[str, Any] = {"context": context, "locator": locator}
         if max_node_count is not None:
             params["maxNodeCount"] = max_node_count
-        if ownership is not None:
-            params["ownership"] = ownership
-        if sandbox is not None:
-            params["sandbox"] = sandbox
         if serialization_options is not None:
             params["serializationOptions"] = serialization_options
         if start_nodes is not None:
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"repository": "https://github.com/w3c/web-platform-tests.git",`
`3`		`- "revision": "097898330ea0759bf785b4e01965e7790bec9bf5",`
	`3`	`+ "revision": "da531cba2698417ff5922863e334909a013fce91",`
`4`	`4`	`"paths_to_import": [`
`5`	`5`	`"tools/webdriver",`
`6`	`6`	`"tools/wptrunner",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`# flake8: noqa`
`2`	`2`
`3`	`3`	`from .client import BidiSession`
	`4`	`+from .protocol import BidiWindow`