fixup! [FIX COMMIT MSG] Implement WebDriver executor for wptrunner

web-platform-tests · Aug 28, 2018 · 81995b8 · 81995b8
1 parent 86582c6
commit 81995b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/tools/wptrunner/wptrunner/browsers/edge_webdriver.py b/tools/wptrunner/wptrunner/browsers/edge_webdriver.py
@@ -2,7 +2,6 @@
 
 from . import edge
 
-from ..executors import executor_kwargs as base_executor_kwargs
 from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
                                            WebDriverRefTestExecutor)  # noqa: F401
 

diff --git a/tools/wptrunner/wptrunner/browsers/safari_webdriver.py b/tools/wptrunner/wptrunner/browsers/safari_webdriver.py
@@ -2,7 +2,6 @@
 
 from . import safari
 
-from ..executors import executor_kwargs as base_executor_kwargs
 from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
                                            WebDriverRefTestExecutor)  # noqa: F401
 

diff --git a/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -41,7 +41,7 @@ def set_timeout(self, timeout):
         except client.WebDriverException:
             # workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2057
             body = {"type": "script", "ms": timeout * 1000}
-            self.webdriver.session.send_session_command("POST", "timeouts", body)
+            self.webdriver.send_session_command("POST", "timeouts", body)
 
     @property
     def current_window(self):
@@ -135,7 +135,14 @@ def setup(self):
         self.webdriver = self.parent.webdriver
 
     def send_keys(self, element, keys):
-        return element.send_keys(keys)
+        try:
+            return element.send_keys(keys)
+        except client.UnknownErrorException as e:
+            # workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=1999
+            if (e.http_status != 500 or
+                e.status_code != "unknown error"):
+                raise
+            return element.send_element_command("POST", "value", {"value": list(keys)})
 
 
 class WebDriverTestDriverProtocolPart(TestDriverProtocolPart):