<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[225476] trunk/WebDriverTests</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/225476">225476</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-12-04 03:34:41 -0800 (Mon, 04 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebDriverTestsChangeLog">trunk/WebDriverTests/ChangeLog</a></li>
<li><a href="#trunkWebDriverTestsimportedw3cimporterjson">trunk/WebDriverTests/imported/w3c/importer.json</a></li>
<li><a href="#trunkWebDriverTestsimportedw3ctoolswebdriverwebdriverclientpy">trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/client.py</a></li>
<li><a href="#trunkWebDriverTestsimportedw3ctoolswebdriverwebdrivererrorpy">trunk/WebDriverTests/imported/w3c/tools/webdriver/webdriver/error.py</a></li>
<li><a href="#trunkWebDriverTestsimportedw3cwebdrivertestselement_retrievalget_active_elementpy">trunk/WebDriverTests/imported/w3c/webdriver/tests/element_retrieval/get_active_element.py</a></li>
<li><a href="#trunkWebDriverTestsimportedw3cwebdrivertestsinteractionelement_clearpy">trunk/WebDriverTests/imported/w3c/webdriver/tests/interaction/element_clear.py</a></li>
<li><a href="#trunkWebDriverTestsimportedw3cwebdrivertestssessionsstatuspy">trunk/WebDriverTests/imported/w3c/webdriver/tests/sessions/status.py</a></li>
<li><a href="#trunkWebDriverTestsimportedw3cwebdrivertestssupportwaitpy">trunk/WebDriverTests/imported/w3c/webdriver/tests/support/wait.py</a></li>
</ul>

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

</body>
</html>