<!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>[193624] 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/193624">193624</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-07 08:18:04 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mock TestRepositories in W3C importer tests
https://bugs.webkit.org/show_bug.cgi?id=151938
Reviewed by Youenn Fablet.
The test importer tests should use a fake repository instead of using the real one. The reason why this happened
is because the test repository method reading the file was using the filesystem directly instead of taking the
host one. This patch changes that.
* Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.load_test_repositories): Take a filesystem and use it. If we get no filesystem, we use the
default one.
(TestDownloader.__init__): When loading the repositories, pass the host filesystem.
* Scripts/webkitpy/w3c/test_importer_unittest.py:
(TestImporterTest.test_harnesslinks_conversion):
(TestImporterTest.test_submodules_generation): Use a fake test repository file.</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 (193623 => 193624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-07 13:49:41 UTC (rev 193623)
+++ trunk/Tools/ChangeLog 2015-12-07 16:18:04 UTC (rev 193624)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-07 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ Mock TestRepositories in W3C importer tests
+ https://bugs.webkit.org/show_bug.cgi?id=151938
+
+ Reviewed by Youenn Fablet.
+
+ The test importer tests should use a fake repository instead of using the real one. The reason why this happened
+ is because the test repository method reading the file was using the filesystem directly instead of taking the
+ host one. This patch changes that.
+
+ * Scripts/webkitpy/w3c/test_downloader.py:
+ (TestDownloader.load_test_repositories): Take a filesystem and use it. If we get no filesystem, we use the
+ default one.
+ (TestDownloader.__init__): When loading the repositories, pass the host filesystem.
+ * Scripts/webkitpy/w3c/test_importer_unittest.py:
+ (TestImporterTest.test_harnesslinks_conversion):
+ (TestImporterTest.test_submodules_generation): Use a fake test repository file.
+
</ins><span class="cx"> 2015-12-07 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> TestNetscapePlugIn: Address review comment on 193607
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_downloaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py (193623 => 193624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2015-12-07 13:49:41 UTC (rev 193623)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2015-12-07 16:18:04 UTC (rev 193624)
</span><span class="lines">@@ -51,8 +51,7 @@
</span><span class="cx"> return options
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><del>- def load_test_repositories():
- filesystem = FileSystem()
</del><ins>+ def load_test_repositories(filesystem=FileSystem()):
</ins><span class="cx"> webkit_finder = WebKitFinder(filesystem)
</span><span class="cx"> test_repositories_path = webkit_finder.path_from_webkit_base('LayoutTests', 'imported', 'w3c', 'resources', 'TestRepositories')
</span><span class="cx"> return json.loads(filesystem.read_text_file(test_repositories_path))
</span><span class="lines">@@ -65,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> self.repository_directory = repository_directory
</span><span class="cx">
</span><del>- self.test_repositories = self.load_test_repositories()
</del><ins>+ self.test_repositories = self.load_test_repositories(self._filesystem)
</ins><span class="cx">
</span><span class="cx"> self.paths_to_skip = []
</span><span class="cx"> self.paths_to_import = []
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importer_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py (193623 => 193624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2015-12-07 13:49:41 UTC (rev 193623)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2015-12-07 16:18:04 UTC (rev 193624)
</span><span class="lines">@@ -46,6 +46,28 @@
</span><span class="cx"> '/mock-checkout/LayoutTests/w3c/css-fake-1/README.txt': '',
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FAKE_REPOSITORY = {
+ '/mock-checkout/LayoutTests/imported/w3c/resources/TestRepositories': '''
+[
+ {
+ "name": "csswg-tests",
+ "url": "https://github.com/w3c/csswg-test.git",
+ "revision": "9f45f89",
+ "paths_to_skip": [],
+ "paths_to_import": [],
+ "import_options": ["convert_test_harness_links"]
+ },
+ {
+ "name": "web-platform-tests",
+ "url": "https://github.com/w3c/web-platform-tests.git",
+ "revision": "dd553279c3",
+ "paths_to_skip": [],
+ "paths_to_import": [],
+ "import_options": []
+ }
+]
+''' }
+
</ins><span class="cx"> class TestImporterTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> def test_import_dir_with_no_tests_and_no_hg(self):
</span><span class="lines">@@ -118,6 +140,7 @@
</span><span class="cx"> '/mock-checkout/Source/WebCore/css/CSSPropertyNames.in': '',
</span><span class="cx"> '/mock-checkout/Source/WebCore/css/CSSValueKeywords.in': '',
</span><span class="cx"> }
</span><ins>+ FAKE_FILES.update(FAKE_REPOSITORY)
</ins><span class="cx">
</span><span class="cx"> fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
</span><span class="cx">
</span><span class="lines">@@ -131,6 +154,7 @@
</span><span class="cx"> '/mock-checkout/WebKitBuild/w3c-tests/csswg-tests/.gitmodules': '[submodule "tools/resources"]\n path = tools/resources\n url = https://github.com/w3c/testharness.js.git\n ignore = dirty\n',
</span><span class="cx"> '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/.gitmodules': '[submodule "tools/resources"]\n path = tools/resources\n url = https://github.com/w3c/testharness.js.git\n ignore = dirty\n',
</span><span class="cx"> }
</span><ins>+ FAKE_FILES.update(FAKE_REPOSITORY)
</ins><span class="cx">
</span><span class="cx"> fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>