Changeset 173535 in webkit

Timestamp:

Sep 11, 2014 1:38:19 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/w3c/test_converter_unittest.py (modified) (7 diffs)
• Scripts/webkitpy/w3c/test_parser.py (modified) (2 diffs)
• Scripts/webkitpy/w3c/test_parser_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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:
+
 2014-09-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

@@ -54 +54 @@
 
         # FIXME: We should be passing in a MockHost here ...
-        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
+        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
         prop_list = converter.prefixed_properties
         self.assertTrue(prop_list, 'No prefixed properties found')
@@ -79 +79 @@
 </html>
 """
-        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
+        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
 
         oc = OutputCapture()
@@ -101 +101 @@
 """
         fake_dir_path = self.fake_dir_path("harnessonly")
-        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
+        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
         converter.feed(test_html)
         converter.close()
@@ -129 +129 @@
 """
         fake_dir_path = self.fake_dir_path('harnessandprops')
-        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
+        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
         test_content = self.generate_test_content(converter.prefixed_properties, 1, test_html)
 
@@ -166 +166 @@
 """
         fake_dir_path = self.fake_dir_path('harnessandprops')
-        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
+        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
 
         oc = OutputCapture()
@@ -192 +192 @@
 """
         fake_dir_path = self.fake_dir_path('testharnesspaths')
-        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME)
+        converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)
 
         oc = OutputCapture()
@@ -269 +269 @@
 </html>
 """
-        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME)
+        converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)
         test_content = self.generate_test_content(converter.prefixed_properties, 20, test_html)
 

trunk/Tools/Scripts/webkitpy/w3c/test_parser.py

@@ -74 +74 @@
         test_info = None
 
+        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)
+
         # First check if it's a reftest
         matches = self.reference_links_of_type('match') + self.reference_links_of_type('mismatch')
@@ -140 +147 @@
         for path in paths:
             uri_scheme_pattern = re.compile(r"[A-Za-z][A-Za-z+.-]*:")
-            if uri_scheme_pattern.match(path):
+            if not uri_scheme_pattern.match(path):
                 support_files.append(path)
 

trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

@@ -134 +134 @@
         self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
         self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')
-        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')
+        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')
         self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')