Diff
Modified: trunk/WebDriverTests/ChangeLog (225475 => 225476)
--- trunk/WebDriverTests/ChangeLog 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/ChangeLog 2017-12-04 11:34:41 UTC (rev 225476)
@@ -1,3 +1,15 @@
+2017-12-04 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Update W3C WebDriver imported tests.
+
+ * imported/w3c/importer.json:
+ * imported/w3c/tools/webdriver/webdriver/client.py:
+ * imported/w3c/tools/webdriver/webdriver/error.py:
+ * imported/w3c/webdriver/tests/element_retrieval/get_active_element.py:
+ * imported/w3c/webdriver/tests/interaction/element_clear.py:
+ * imported/w3c/webdriver/tests/sessions/status.py:
+ * imported/w3c/webdriver/tests/support/wait.py:
+
2017-12-01 Carlos Garcia Campos <cgar...@igalia.com>
WebDriver: auto-install pytest instead of importing it from wpt tools directory
Modified: trunk/WebDriverTests/imported/w3c/importer.json (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/importer.json 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/importer.json 2017-12-04 11:34:41 UTC (rev 225476)
@@ -1,6 +1,6 @@
{
"repository": "https://github.com/w3c/web-platform-tests.git",
- "revision": "2b50389ee72d89dd0be12bc6ca54a6e95c98d163",
+ "revision": "267d6b27ffd416577702653c0987b30239daae3f",
"paths_to_import": [
"tools/webdriver",
"tools/wptrunner",
Modified: trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/client.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/client.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/client.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -42,7 +42,7 @@
def _set(self, key, secs):
body = {key: secs * 1000}
timeouts = self.session.send_session_command("POST", "timeouts", body)
- return timeouts[key]
+ return None
@property
def script(self):
Modified: trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/error.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/error.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/error.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -8,6 +8,7 @@
def __init__(self, message, stacktrace=None):
super(WebDriverException, self)
+ self.message = message
self.stacktrace = stacktrace
def __repr__(self):
@@ -14,11 +15,13 @@
return "<%s http_status=%s>" % (self.__class__.__name__, self.http_status)
def __str__(self):
- return ("%s (%s)\n"
- "\n"
+ message = "%s (%s): %s\n" % (self.status_code, self.http_status, self.message)
+ if self.stacktrace:
+ message += ("\n"
"Remote-end stacktrace:\n"
"\n"
- "%s" % (self.status_code, self.http_status, self.stacktrace))
+ "%s" % self.stacktrace)
+ return message
class ElementClickInterceptedException(WebDriverException):
Modified: trunk/WebDriverTests/imported/w3c/webdriver/tests/element_retrieval/get_active_element.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/webdriver/tests/element_retrieval/get_active_element.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/webdriver/tests/element_retrieval/get_active_element.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -69,7 +69,7 @@
response = get_active_element(session)
assert_is_active_element(session, response)
assert_dialog_handled(session, "dismiss #2")
- assert read_global(session, "dismiss2") is None
+ assert read_global(session, "dismiss2") is False
create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
Modified: trunk/WebDriverTests/imported/w3c/webdriver/tests/interaction/element_clear.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/webdriver/tests/interaction/element_clear.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/webdriver/tests/interaction/element_clear.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -147,9 +147,9 @@
url = "" + """<input id=focusCheck type=checkbox>
<input id=blurCheck type=checkbox>
<script>
- var id = %s
- document.getElementById("id").addEventListener("focus", checkFocus);
- document.getElementById("id").addEventListener("blur", checkBlur);
+ var id = "%s";
+ document.getElementById(id).addEventListener("focus", checkFocus);
+ document.getElementById(id).addEventListener("blur", checkBlur);
document.getElementById("empty").addEventListener("focus", checkFocus);
document.getElementById("empty").addEventListener("blur", checkBlur);
@@ -163,15 +163,15 @@
session.url = ""
# Step 1
empty_element = session.find.css("#empty", all=False)
- test_clear_element_helper(session, empty_element, False)
+ clear_element_test_helper(session, empty_element, False)
session.execute_script("document.getElementById(\"focusCheck\").checked = false;")
session.execute_script("document.getElementById(\"blurCheck\").checked = false;")
# Step 2 - 4
test_element = session.find.css("#" + element[0], all=False)
- test_clear_element_helper(session, test_element, True)
+ clear_element_test_helper(session, test_element, True)
-def test_clear_element_helper(session, element, value):
+def clear_element_test_helper(session, element, value):
response = clear(session, element)
assert_success(response)
response = session.execute_script("return document.getElementById(\"focusCheck\").checked;")
Modified: trunk/WebDriverTests/imported/w3c/webdriver/tests/sessions/status.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/webdriver/tests/sessions/status.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/webdriver/tests/sessions/status.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -21,13 +21,13 @@
assert isinstance(value["message"], basestring)
-def test_status_with_session_running_on_endpoint_node(new_session):
+def test_status_with_session_running_on_endpoint_node(new_session, add_browser_capabilites):
# For an endpoint node, the maximum number of active
# sessions is 1: https://www.w3.org/TR/webdriver/#dfn-maximum-active-sessions
# A session is open, so we expect `ready` to be False
# 8.3 step 1.
- _, session = new_session("{}") # we don't care what we're using
+ _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
value = session.send_command("GET", "status")
assert value["ready"] == False
Modified: trunk/WebDriverTests/imported/w3c/webdriver/tests/support/wait.py (225475 => 225476)
--- trunk/WebDriverTests/imported/w3c/webdriver/tests/support/wait.py 2017-12-04 11:30:10 UTC (rev 225475)
+++ trunk/WebDriverTests/imported/w3c/webdriver/tests/support/wait.py 2017-12-04 11:34:41 UTC (rev 225476)
@@ -35,5 +35,4 @@
continue
return success
- print "Last exception encountered was {}".format(last_exc)
raise TimeoutException("Timed out after %d seconds: %s" % (timeout, message))
