<!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>[192617] trunk/Tools</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/192617">192617</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-19 00:17:44 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WPT server should use its own testharness.js file and generate a warning when it does not match WebKit version
https://bugs.webkit.org/show_bug.cgi?id=150332
Reviewed by Darin Adler and Ryosuke Niwa.
Removing testharness.js overwriting from LayoutTests/resources to LayoutTests/imported/w3c/web-platform-tests/resources.
Adding support for file comparison in python filesystem.
#NousSommesUnis.
* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.compare): Adding compare as a wrapper around filecmp.cmp.
* Scripts/webkitpy/common/system/filesystem_mock.py:
(MockFileSystem.compare): Adding a mock compare.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer.__init__): Removed testharness.js as file to copy from WK to WPT.
(WebPlatformTestServer._copy_webkit_test_files): Added warning generation when WK testharness.js is not matching WPT version.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py:
(TestWebPlatformTestServer.test_previously_spawned_instance): Updated tests to add testharness.js to mock filesystem.
(TestWebPlatformTestServer.test_corrupted_subserver_files): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystempy">trunk/Tools/Scripts/webkitpy/common/system/filesystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy">trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_server_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192616 => 192617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-19 08:05:01 UTC (rev 192616)
+++ trunk/Tools/ChangeLog 2015-11-19 08:17:44 UTC (rev 192617)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WPT server should use its own testharness.js file and generate a warning when it does not match WebKit version
+ https://bugs.webkit.org/show_bug.cgi?id=150332
+
+ Reviewed by Darin Adler and Ryosuke Niwa.
+
+ Removing testharness.js overwriting from LayoutTests/resources to LayoutTests/imported/w3c/web-platform-tests/resources.
+ Adding support for file comparison in python filesystem.
+ #NousSommesUnis.
+
+ * Scripts/webkitpy/common/system/filesystem.py:
+ (FileSystem.compare): Adding compare as a wrapper around filecmp.cmp.
+ * Scripts/webkitpy/common/system/filesystem_mock.py:
+ (MockFileSystem.compare): Adding a mock compare.
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer.__init__): Removed testharness.js as file to copy from WK to WPT.
+ (WebPlatformTestServer._copy_webkit_test_files): Added warning generation when WK testharness.js is not matching WPT version.
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py:
+ (TestWebPlatformTestServer.test_previously_spawned_instance): Updated tests to add testharness.js to mock filesystem.
+ (TestWebPlatformTestServer.test_corrupted_subserver_files): Ditto.
+
</ins><span class="cx"> 2015-11-18 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK1] Crash loading Blink layout test fast/dom/Window/property-access-on-cached-window-after-frame-removed.html
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (192616 => 192617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2015-11-19 08:05:01 UTC (rev 192616)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2015-11-19 08:17:44 UTC (rev 192617)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> import codecs
</span><span class="cx"> import errno
</span><span class="cx"> import exceptions
</span><ins>+import filecmp
</ins><span class="cx"> import glob
</span><span class="cx"> import hashlib
</span><span class="cx"> import os
</span><span class="lines">@@ -304,3 +305,6 @@
</span><span class="cx"> def splitext(self, path):
</span><span class="cx"> """Return (dirname + os.sep + basename, '.' + ext)"""
</span><span class="cx"> return os.path.splitext(path)
</span><ins>+
+ def compare(self, path1, path2):
+ return filecmp.cmp(path1, path2)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (192616 => 192617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2015-11-19 08:05:01 UTC (rev 192616)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2015-11-19 08:17:44 UTC (rev 192617)
</span><span class="lines">@@ -418,7 +418,10 @@
</span><span class="cx"> idx = len(path)
</span><span class="cx"> return (path[0:idx], path[idx:])
</span><span class="cx">
</span><ins>+ def compare(self, path1, path2):
+ return self.read_binary_file(path1) == self.read_binary_file(path2)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class WritableBinaryFileObject(object):
</span><span class="cx"> def __init__(self, fs, path):
</span><span class="cx"> self.fs = fs
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (192616 => 192617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-11-19 08:05:01 UTC (rev 192616)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-11-19 08:17:44 UTC (rev 192617)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> self._layout_root = port_obj.path_from_webkit_base("LayoutTests")
</span><span class="cx"> self._doc_root = self._filesystem.join(self._layout_root, doc_root(port_obj))
</span><span class="cx">
</span><del>- self._resources_files_to_copy = ['testharness.js', 'testharness.css', 'testharnessreport.js']
</del><ins>+ self._resources_files_to_copy = ['testharness.css', 'testharnessreport.js']
</ins><span class="cx">
</span><span class="cx"> current_dir_path = self._filesystem.abspath(self._filesystem.split(__file__)[0])
</span><span class="cx"> self._start_cmd = ["python", self._filesystem.join(current_dir_path, "web_platform_test_launcher.py"), self._servers_file]
</span><span class="lines">@@ -99,6 +99,14 @@
</span><span class="cx"> config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs"))
</span><span class="cx"> self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json)
</span><span class="cx">
</span><ins>+ wpt_testharnessjs_file = self._filesystem.join(self._doc_root, "resources", "testharness.js")
+ layout_tests_testharnessjs_file = self._filesystem.join(self._layout_root, "resources", "testharness.js")
+ # FIXME: Next two lines are a temp hack for this patch to land smoothly on bots. They should be removed once patch landed and each bot runs these lines once.
+ if (not self._filesystem.isfile(wpt_testharnessjs_file)):
+ self._filesystem.copyfile(layout_tests_testharnessjs_file, wpt_testharnessjs_file)
+ if (not self._filesystem.compare(wpt_testharnessjs_file, layout_tests_testharnessjs_file)):
+ _log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n")
+
</ins><span class="cx"> def _clean_webkit_test_files(self):
</span><span class="cx"> _log.debug('Cleaning WPT resources files')
</span><span class="cx"> for f in self._resources_files_to_copy:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_server_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py (192616 => 192617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py 2015-11-19 08:05:01 UTC (rev 192616)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py 2015-11-19 08:17:44 UTC (rev 192617)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> server = WebPlatformTestServer(port, "wpttest", "/mock/output_dir", "/mock/output_dir/pid.txt")
</span><span class="cx"> server._check_that_all_ports_are_available = lambda: True
</span><span class="cx"> server._is_server_running_on_all_ports = lambda: True
</span><ins>+ host.filesystem.write_text_file("/mock-checkout/LayoutTests/resources/testharness.js", "0")
+ host.filesystem.write_text_file("/mock-checkout/LayoutTests/imported/w3c/web-platform-tests/resources/testharness.js", "0")
</ins><span class="cx">
</span><span class="cx"> host.filesystem.write_text_file("/mock_output_dir/pid.txt", "0")
</span><span class="cx"> server.start()
</span><span class="lines">@@ -53,6 +55,8 @@
</span><span class="cx"> server = WebPlatformTestServer(port, "wpttest", "/mock/output_dir", "/mock/output_dir/pid.txt")
</span><span class="cx"> server._check_that_all_ports_are_available = lambda: True
</span><span class="cx"> server._is_server_running_on_all_ports = lambda: True
</span><ins>+ host.filesystem.write_text_file("/mock-checkout/LayoutTests/resources/testharness.js", "0")
+ host.filesystem.write_text_file("/mock-checkout/LayoutTests/imported/w3c/web-platform-tests/resources/testharness.js", "0")
</ins><span class="cx">
</span><span class="cx"> host.filesystem.write_text_file("/mock_output_dir/wpttest_servers.json", "0")
</span><span class="cx"> server.stop()
</span></span></pre>
</div>
</div>
</body>
</html>