<!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>[226031] releases/WebKitGTK/webkit-2.18</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/226031">226031</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-12-18 03:48:00 -0800 (Mon, 18 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/225211">r225211</a> - WebDriver: add timeout option to run-webdriver-tests script
https://bugs.webkit.org/show_bug.cgi?id=179940

Reviewed by Carlos Alberto Lopez Perez.

Tools:

We need to handle timeouts to be able to run the tests in the bots. pytest doesn't support timeouts, but there's
a plugin pytest_timeout that can be used for that.

* Scripts/run-webdriver-tests: Add --timeout command line option.
* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook.find_module): Check if pytest_timeout is imported to install it.
(AutoinstallImportHook._install_pytest_timeout): Install pytest_timeout from pypi.
* Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py:
(WebDriverTestRunnerW3C.__init__): Set PYTEST_TIMEOUT env var with the timeout given.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
(WebDriverW3CExecutor.run): Clarify that the timeout received by do_wdspec() is ignored, and pass 0 instead of 25.

WebDriverTests:

Add a base conftest.py to load pytest_timeout plugin.

* imported/w3c/conftest.py: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit218ToolsChangeLog">releases/WebKitGTK/webkit-2.18/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit218ToolsScriptsrunwebdrivertests">releases/WebKitGTK/webkit-2.18/Tools/Scripts/run-webdriver-tests</a></li>
<li><a href="#releasesWebKitGTKwebkit218ToolsScriptswebkitpythirdparty__init__py">releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/thirdparty/__init__.py</a></li>
<li><a href="#releasesWebKitGTKwebkit218ToolsScriptswebkitpywebdriver_testswebdriver_test_runner_w3cpy">releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py</a></li>
<li><a href="#releasesWebKitGTKwebkit218ToolsScriptswebkitpywebdriver_testswebdriver_w3c_executorpy">releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py</a></li>
<li><a href="#releasesWebKitGTKwebkit218WebDriverTestsChangeLog">releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit218WebDriverTestsimportedw3cconftestpy">releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/w3c/conftest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit218ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/Tools/ChangeLog (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/Tools/ChangeLog   2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/Tools/ChangeLog      2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-11-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: add timeout option to run-webdriver-tests script
+        https://bugs.webkit.org/show_bug.cgi?id=179940
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        We need to handle timeouts to be able to run the tests in the bots. pytest doesn't support timeouts, but there's
+        a plugin pytest_timeout that can be used for that.
+
+        * Scripts/run-webdriver-tests: Add --timeout command line option.
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook.find_module): Check if pytest_timeout is imported to install it.
+        (AutoinstallImportHook._install_pytest_timeout): Install pytest_timeout from pypi.
+        * Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py:
+        (WebDriverTestRunnerW3C.__init__): Set PYTEST_TIMEOUT env var with the timeout given.
+        * Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
+        (WebDriverW3CExecutor.run): Clarify that the timeout received by do_wdspec() is ignored, and pass 0 instead of 25.
+
</ins><span class="cx"> 2017-11-15  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] Add initial support for WebDriver
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit218ToolsScriptsrunwebdrivertests"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/Tools/Scripts/run-webdriver-tests (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/Tools/Scripts/run-webdriver-tests 2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/Tools/Scripts/run-webdriver-tests    2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx">                          help='Set the configuration to Release')
</span><span class="cx"> option_parser.add_option('--debug', action='store_const', const='Debug', dest="configuration",
</span><span class="cx">                          help='Set the configuration to Debug')
</span><ins>+option_parser.add_option('--timeout', action='store', type='int', dest='timeout', default=10,
+                         help='Time in seconds until a test times out (use 0 to disable)')
</ins><span class="cx"> option_parser.add_option('--display-server', choices=['xvfb', 'xorg', 'weston', 'wayland'], default='xvfb',
</span><span class="cx">                          help='"xvfb": Use a virtualized X11 server. "xorg": Use the current X11 session. '
</span><span class="cx">                               '"weston": Use a virtualized Weston server. "wayland": Use the current wayland session.')
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit218ToolsScriptswebkitpythirdparty__init__py"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/thirdparty/__init__.py (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/thirdparty/__init__.py     2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/thirdparty/__init__.py        2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -110,6 +110,8 @@
</span><span class="cx">             self._install_mozlog()
</span><span class="cx">         elif '.mozprocess' in fullname:
</span><span class="cx">             self._install_mozprocess()
</span><ins>+        elif '.pytest_timeout' in fullname:
+            self._install_pytest_timeout()
</ins><span class="cx"> 
</span><span class="cx">     def _install_mechanize(self):
</span><span class="cx">         self._install("https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz",
</span><span class="lines">@@ -133,6 +135,10 @@
</span><span class="cx">         self._install("https://pypi.python.org/packages/cb/26/144dbc28d1f40e392f8a0cbee771ba624a61017f016c77ad88424d84b230/mozprocess-0.25.tar.gz#md5=07a04e6ae1a705705e4b44969fe7a182",
</span><span class="cx">                               "mozprocess-0.25/mozprocess")
</span><span class="cx"> 
</span><ins>+    def _install_pytest_timeout(self):
+        self._install("https://pypi.python.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz#md5=83607d91aa163562c7ee835da57d061d",
+                              "pytest-timeout-1.2.0/pytest_timeout.py")
+
</ins><span class="cx">     def _install_pylint(self):
</span><span class="cx">         self._ensure_autoinstalled_dir_is_in_sys_path()
</span><span class="cx">         if (not self._fs.exists(self._fs.join(_AUTOINSTALLED_DIR, "pylint")) or
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit218ToolsScriptswebkitpywebdriver_testswebdriver_test_runner_w3cpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py       2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py  2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx">         _log.info('Using driver at %s' % (self._driver.binary_path()))
</span><span class="cx">         _log.info('Browser: %s' % (self._driver.browser_name()))
</span><span class="cx"> 
</span><ins>+        timeout = self._port.get_option('timeout')
+        if timeout > 0:
+            os.environ['PYTEST_TIMEOUT'] = str(timeout)
+
</ins><span class="cx">         self._results = []
</span><span class="cx">         self._server = WebDriverW3CWebServer(self._port)
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit218ToolsScriptswebkitpywebdriver_testswebdriver_w3c_executorpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py  2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py     2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> _ensure_directory_in_path(os.path.join(w3c_tools_dir, 'wptrunner'))
</span><span class="cx"> _ensure_directory_in_path(os.path.join(w3c_tools_dir, "webdriver"))
</span><span class="cx"> 
</span><ins>+import webkitpy.thirdparty.autoinstalled.pytest_timeout
</ins><span class="cx"> from wptrunner.executors.base import WdspecExecutor, WebDriverProtocol
</span><span class="cx"> from wptrunner.webdriver_server import WebDriverServer
</span><span class="cx"> 
</span><span class="lines">@@ -136,4 +137,5 @@
</span><span class="cx">         self.protocol.teardown()
</span><span class="cx"> 
</span><span class="cx">     def run(self, path):
</span><del>-        return self.do_wdspec(self.protocol.session_config, path, 25)
</del><ins>+        # Timeout here doesn't really matter because it's ignored, so we pass 0.
+        return self.do_wdspec(self.protocol.session_config, path, 0)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit218WebDriverTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog (226030 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog  2017-12-18 11:47:54 UTC (rev 226030)
+++ releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog     2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-11-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: add timeout option to run-webdriver-tests script
+        https://bugs.webkit.org/show_bug.cgi?id=179940
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Add a base conftest.py to load pytest_timeout plugin.
+
+        * imported/w3c/conftest.py: Added.
+
</ins><span class="cx"> 2017-11-21  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Update W3C WebDriver imported tests.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit218WebDriverTestsimportedw3cconftestpy"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/w3c/conftest.py (0 => 226031)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/w3c/conftest.py                           (rev 0)
+++ releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/w3c/conftest.py      2017-12-18 11:48:00 UTC (rev 226031)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+pytest_plugins = 'pytest_timeout',
</ins></span></pre>
</div>
</div>

</body>
</html>