<!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>[193638] 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/193638">193638</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-07 10:49:59 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support to import w3c tests from a repository with a different root that the main repo dir
https://bugs.webkit.org/show_bug.cgi?id=151751
Reviewed by Ryosuke Niwa and Youenn Fablet.
We should be able to import tests from repositories that are not pure test repositories and where tests are kept
in a different directory than the repository root.
This patch introduces a new parameter tests_directory that we will use as root directory to search for
tests. All paths will be flattened when copying tests to have a less complicated directory structure. This
requires having the copy_path lists including tuples of origin and destination directories.
* Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader._add_test_suite_paths): Adds the paths as a tuple of origin and destination directory.
(TestDownloader.copy_tests): Uses the origin and destination tuple for the paths to copy when copying files.
* Scripts/webkitpy/w3c/test_importer_unittest.py:
(TestImporterTest.test_tests_directory): Test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_downloaderpy">trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importer_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (193637 => 193638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-07 18:35:56 UTC (rev 193637)
+++ trunk/Tools/ChangeLog 2015-12-07 18:49:59 UTC (rev 193638)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-12-07 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><ins>+ Add support to import w3c tests from a repository with a different root that the main repo dir
+ https://bugs.webkit.org/show_bug.cgi?id=151751
+
+ Reviewed by Ryosuke Niwa and Youenn Fablet.
+
+ We should be able to import tests from repositories that are not pure test repositories and where tests are kept
+ in a different directory than the repository root.
+
+ This patch introduces a new parameter tests_directory that we will use as root directory to search for
+ tests. All paths will be flattened when copying tests to have a less complicated directory structure. This
+ requires having the copy_path lists including tuples of origin and destination directories.
+
+ * Scripts/webkitpy/w3c/test_downloader.py:
+ (TestDownloader._add_test_suite_paths): Adds the paths as a tuple of origin and destination directory.
+ (TestDownloader.copy_tests): Uses the origin and destination tuple for the paths to copy when copying files.
+ * Scripts/webkitpy/w3c/test_importer_unittest.py:
+ (TestImporterTest.test_tests_directory): Test.
+
+2015-12-07 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
</ins><span class="cx"> Mock TestRepositories in W3C importer tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151938
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_downloaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py (193637 => 193638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2015-12-07 18:35:56 UTC (rev 193637)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2015-12-07 18:49:59 UTC (rev 193638)
</span><span class="lines">@@ -105,11 +105,12 @@
</span><span class="cx"> elif 'PASS' in line.expectations:
</span><span class="cx"> self.paths_to_import.append(line.name)
</span><span class="cx">
</span><del>- def _add_test_suite_paths(self, test_paths, directory, webkit_path):
- for name in self._filesystem.listdir(directory):
- path = self._filesystem.join(webkit_path, name)
- if not name.startswith('.') and not path in self.paths_to_skip:
- test_paths.append(path)
</del><ins>+ def _add_test_suite_paths(self, test_paths, directory, webkit_path, tests_directory):
+ complete_directory = self._filesystem.join(directory, tests_directory)
+ for name in self._filesystem.listdir(complete_directory):
+ original_path = self._filesystem.join(webkit_path, tests_directory, name)
+ if not name.startswith('.') and not original_path in self.paths_to_skip:
+ test_paths.append((original_path, self._filesystem.join(webkit_path, name)))
</ins><span class="cx">
</span><span class="cx"> def _empty_directory(self, directory):
</span><span class="cx"> if self._filesystem.exists(directory):
</span><span class="lines">@@ -122,19 +123,22 @@
</span><span class="cx">
</span><span class="cx"> copy_paths = []
</span><span class="cx"> if test_paths:
</span><del>- copy_paths.extend(test_paths)
- copy_paths.extend(self.paths_to_import)
</del><ins>+ for path in test_paths:
+ copy_paths.append((path, path))
+ for path in self.paths_to_import:
+ copy_paths.append((path, path))
</ins><span class="cx"> else:
</span><span class="cx"> for test_repository in self.test_repositories:
</span><del>- self._add_test_suite_paths(copy_paths, self._filesystem.join(self.repository_directory, test_repository['name']), test_repository['name'])
</del><ins>+ self._add_test_suite_paths(copy_paths, self._filesystem.join(self.repository_directory, test_repository['name']), test_repository['name'],
+ test_repository['tests_directory'] if ('tests_directory' in test_repository) else '')
</ins><span class="cx"> # Handling of tests marked as [ Pass ] in expectations file.
</span><span class="cx"> for path in self.paths_to_import:
</span><del>- if not path in copy_paths:
- copy_paths.append(path)
</del><ins>+ if not (path, path) in copy_paths:
+ copy_paths.append((path, path))
</ins><span class="cx">
</span><del>- for path in copy_paths:
- source_path = self._filesystem.join(self.repository_directory, path)
- destination_path = self._filesystem.join(destination_directory, path)
</del><ins>+ for paths in copy_paths:
+ source_path = self._filesystem.join(self.repository_directory, paths[0])
+ destination_path = self._filesystem.join(destination_directory, paths[1])
</ins><span class="cx"> if not self._filesystem.exists(source_path):
</span><span class="cx"> _log.error('Cannot copy %s' % source_path)
</span><span class="cx"> elif self._filesystem.isdir(source_path):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importer_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py (193637 => 193638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2015-12-07 18:35:56 UTC (rev 193637)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2015-12-07 18:49:59 UTC (rev 193638)
</span><span class="lines">@@ -163,5 +163,27 @@
</span><span class="cx"> self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/resources/web-platform-tests-modules.json'))
</span><span class="cx"> # self.assertFalse('https://github.com/w3c/testharness.js/archive/db4d391a69877d4a1eaaf51d1725c99a5b8ed84.tar.gz' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/resources/web-platform-tests-modules.json'))
</span><span class="cx">
</span><ins>+ def test_tests_directory(self):
+ FAKE_FILES = {
+ '/mock-checkout/WebKitBuild/w3c-tests/streams-api/reference-implementation/web-platform-tests/test.html': '<!doctype html><script src="/resources/testharness.js"></script><script src="/resources/testharnessreport.js"></script>',
+ '/mock-checkout/LayoutTests/imported/w3c/resources/TestRepositories': '''
+[
+ {
+ "name": "streams-api",
+ "url": "https://github.com/whatwg/streams.git",
+ "revision": "7cc96dd",
+ "tests_directory": "reference-implementation/web-platform-tests",
+ "paths_to_skip": [],
+ "paths_to_import": [],
+ "import_options": []
+ }
+]
+'''}
</ins><span class="cx">
</span><ins>+ fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
+
+ self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/streams-api/reference-implementation/web-platform-tests/test.html'))
+ self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/streams-api/test.html'))
+
+
</ins><span class="cx"> # FIXME: Needs more tests.
</span></span></pre>
</div>
</div>
</body>
</html>