<!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>[173535] 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/173535">173535</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-11 13:38:19 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitpy test failures from import-w3c-tests
https://bugs.webkit.org/show_bug.cgi?id=136752
Patch by Rebecca Hauck <rhauck@adobe.com> on 2014-09-11
Reviewed by Bem Jones-Bey.
This patch fixes a bug in import-w3c-tests where we were appending
the wrong set of files to the copy_list. This also updates the tests
to clear the failures introduced in the patch for bug 135929.
* Scripts/webkitpy/w3c/test_converter_unittest.py:
(W3CTestConverterTest.test_read_prefixed_property_list):
* Scripts/webkitpy/w3c/test_parser.py:
(TestParser.analyze_test):
(TestParser.support_files):
* Scripts/webkitpy/w3c/test_parser_unittest.py:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converter_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parserpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parser_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173534 => 173535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-11 20:04:38 UTC (rev 173534)
+++ trunk/Tools/ChangeLog 2014-09-11 20:38:19 UTC (rev 173535)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-11 Rebecca Hauck <rhauck@adobe.com>
+
+ webkitpy test failures from import-w3c-tests
+ https://bugs.webkit.org/show_bug.cgi?id=136752
+
+ Reviewed by Bem Jones-Bey.
+
+ This patch fixes a bug in import-w3c-tests where we were appending
+ the wrong set of files to the copy_list. This also updates the tests
+ to clear the failures introduced in the patch for bug 135929.
+
+ * Scripts/webkitpy/w3c/test_converter_unittest.py:
+ (W3CTestConverterTest.test_read_prefixed_property_list):
+ * Scripts/webkitpy/w3c/test_parser.py:
+ (TestParser.analyze_test):
+ (TestParser.support_files):
+ * Scripts/webkitpy/w3c/test_parser_unittest.py:
+
</ins><span class="cx"> 2014-09-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Blink merge: Speculative fix for windows run-webkit-tests hangs
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converter_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py (173534 => 173535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2014-09-11 20:04:38 UTC (rev 173534)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2014-09-11 20:38:19 UTC (rev 173535)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> """ Tests that the current list of properties requiring the -webkit- prefix load correctly """
</span><span class="cx">
</span><span class="cx"> # FIXME: We should be passing in a MockHost here ...
</span><del>- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
</ins><span class="cx"> prop_list = converter.prefixed_properties
</span><span class="cx"> self.assertTrue(prop_list, 'No prefixed properties found')
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx"> """
</span><del>- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
</ins><span class="cx">
</span><span class="cx"> oc = OutputCapture()
</span><span class="cx"> oc.capture_output()
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> """
</span><span class="cx"> fake_dir_path = self.fake_dir_path("harnessonly")
</span><del>- converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
</ins><span class="cx"> converter.feed(test_html)
</span><span class="cx"> converter.close()
</span><span class="cx"> converted = converter.output()
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> </html>
</span><span class="cx"> """
</span><span class="cx"> fake_dir_path = self.fake_dir_path('harnessandprops')
</span><del>- converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
</ins><span class="cx"> test_content = self.generate_test_content(converter.prefixed_properties, 1, test_html)
</span><span class="cx">
</span><span class="cx"> oc = OutputCapture()
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> </html>
</span><span class="cx"> """
</span><span class="cx"> fake_dir_path = self.fake_dir_path('harnessandprops')
</span><del>- converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
</ins><span class="cx">
</span><span class="cx"> oc = OutputCapture()
</span><span class="cx"> oc.capture_output()
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> """
</span><span class="cx"> fake_dir_path = self.fake_dir_path('testharnesspaths')
</span><del>- converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
</ins><span class="cx">
</span><span class="cx"> oc = OutputCapture()
</span><span class="cx"> oc.capture_output()
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> ]]></style>
</span><span class="cx"> </html>
</span><span class="cx"> """
</span><del>- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
</del><ins>+ converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
</ins><span class="cx"> test_content = self.generate_test_content(converter.prefixed_properties, 20, test_html)
</span><span class="cx">
</span><span class="cx"> oc = OutputCapture()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_parserpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (173534 => 173535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-11 20:04:38 UTC (rev 173534)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-11 20:38:19 UTC (rev 173535)
</span><span class="lines">@@ -73,6 +73,13 @@
</span><span class="cx">
</span><span class="cx"> test_info = None
</span><span class="cx">
</span><ins>+ if test_contents is None and self.test_doc is None:
+ return test_info
+ if test_contents is not None:
+ self.test_doc = Parser(test_contents)
+ if ref_contents is not None:
+ self.ref_doc = Parser(ref_contents)
+
</ins><span class="cx"> # First check if it's a reftest
</span><span class="cx"> matches = self.reference_links_of_type('match') + self.reference_links_of_type('mismatch')
</span><span class="cx"> if matches:
</span><span class="lines">@@ -139,7 +146,7 @@
</span><span class="cx"> paths = src_paths + href_paths + urls
</span><span class="cx"> for path in paths:
</span><span class="cx"> uri_scheme_pattern = re.compile(r"[A-Za-z][A-Za-z+.-]*:")
</span><del>- if uri_scheme_pattern.match(path):
</del><ins>+ if not uri_scheme_pattern.match(path):
</ins><span class="cx"> support_files.append(path)
</span><span class="cx">
</span><span class="cx"> return support_files
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_parser_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py (173534 => 173535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-11 20:04:38 UTC (rev 173534)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-11 20:38:19 UTC (rev 173535)
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> self.assertTrue('test' in test_info.keys(), 'did not find a test file')
</span><span class="cx"> self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
</span><span class="cx"> self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')
</span><del>- self.assertTrue('refsupport' in test_info.keys(), 'there should be refsupport files for this test')
- self.assertEquals(len(test_info['refsupport']), 3, 'there should be 3 support files in this reference')
</del><ins>+ self.assertTrue('reference_support_info' in test_info.keys(), 'there should be reference_support_info for this test')
+ self.assertEquals(len(test_info['reference_support_info']['files']), 3, 'there should be 3 support files in this reference')
</ins><span class="cx"> self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')
</span><span class="cx">
</span><span class="cx"> def test_analyze_jstest(self):
</span></span></pre>
</div>
</div>
</body>
</html>