Changeset 150800 in webkit

Timestamp:

May 28, 2013 6:34:19 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[webkitpy] Explicitly specify the reference file extensions
​https://bugs.webkit.org/show_bug.cgi?id=116333

Reviewed by Benjamin Poulain.

Explicitly specify the extensions that are valid for the reference files. This helps to differentiate
between valid reference files required by reftests and text baselines that have the same extension as
potential test files (specifically the current MHTML tests in the .mht files and the future .mht baselines
that were until this change recognized as reference files).

Covered by existing tests and the new test_is_reference_html_file test in webkitpy.port.base_unittest.

• Scripts/webkitpy/port/base.py:

(Port.reference_files): Iterate through the _supported_reference_extensions set.
(Port): Rename the _supported_file_extensions set to _supported_test_extensions. Add the
_supported_reference_extensions set, containing the extensions allowed for reference files.
(Port.is_reference_html_file): Return False if the file's extension is not a supported reference file extension.
(Port._has_supported_extension): Use _supported_test_extensions.

• Scripts/webkitpy/port/base_unittest.py:

(PortTest.test_is_reference_html_file): Add the unit test, testing various test cases around the
Port.is_reference_html_file method.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (4 diffs)
• Scripts/webkitpy/port/base_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-28  Zan Dobersek  <zdobersek@igalia.com>
+
+        [webkitpy] Explicitly specify the reference file extensions
+        https://bugs.webkit.org/show_bug.cgi?id=116333
+
+        Reviewed by Benjamin Poulain.
+
+        Explicitly specify the extensions that are valid for the reference files. This helps to differentiate
+        between valid reference files required by reftests and text baselines that have the same extension as
+        potential test files (specifically the current MHTML tests in the .mht files and the future .mht baselines
+        that were until this change recognized as reference files).
+
+        Covered by existing tests and the new test_is_reference_html_file test in webkitpy.port.base_unittest.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.reference_files): Iterate through the _supported_reference_extensions set.
+        (Port): Rename the _supported_file_extensions set to _supported_test_extensions. Add the
+        _supported_reference_extensions set, containing the extensions allowed for reference files.
+        (Port.is_reference_html_file): Return False if the file's extension is not a supported reference file extension.
+        (Port._has_supported_extension): Use _supported_test_extensions.
+        * Scripts/webkitpy/port/base_unittest.py:
+        (PortTest.test_is_reference_html_file): Add the unit test, testing various test cases around the
+        Port.is_reference_html_file method.
+
 2013-05-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -572 +572 @@
             reftest_list = []
             for expectation, prefix in (('==', ''), ('!=', '-mismatch')):
-                for extention in Port._supported_file_extensions:
+                for extention in Port._supported_reference_extensions:
                     path = self.expected_filename(test_name, prefix + extention)
                     if self._filesystem.exists(path):
@@ -607 +607 @@
 
     # When collecting test cases, we include any file with these extensions.
-    _supported_file_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl',
-                                      '.htm', '.php', '.svg', '.mht'])
+    _supported_test_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl', '.htm', '.php', '.svg', '.mht'])
+    _supported_reference_extensions = set(['.html', '.xml', '.xhtml', '.htm', '.svg'])
 
     @staticmethod
@@ -615 +615 @@
         if filename.startswith('ref-') or filename.startswith('notref-'):
             return True
-        filename_wihout_ext, unused = filesystem.splitext(filename)
+        filename_wihout_ext, ext = filesystem.splitext(filename)
+        if ext not in Port._supported_reference_extensions:
+            return False
         for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']:
             if filename_wihout_ext.endswith(suffix):
@@ -625 +627 @@
         """Return true if filename is one of the file extensions we want to run a test on."""
         extension = filesystem.splitext(filename)[1]
-        return extension in Port._supported_file_extensions
+        return extension in Port._supported_test_extensions
 
     @staticmethod

trunk/Tools/Scripts/webkitpy/port/base_unittest.py

@@ -348 +348 @@
         self.assertFalse(Port._is_test_file(filesystem, '', 'notref-foo.xhr'))
 
+    def test_is_reference_html_file(self):
+        filesystem = MockFileSystem()
+        self.assertTrue(Port.is_reference_html_file(filesystem, '', 'foo-expected.html'))
+        self.assertTrue(Port.is_reference_html_file(filesystem, '', 'foo-expected-mismatch.xml'))
+        self.assertTrue(Port.is_reference_html_file(filesystem, '', 'foo-ref.xhtml'))
+        self.assertTrue(Port.is_reference_html_file(filesystem, '', 'foo-notref.svg'))
+        self.assertFalse(Port.is_reference_html_file(filesystem, '', 'foo.html'))
+        self.assertFalse(Port.is_reference_html_file(filesystem, '', 'foo-expected.txt'))
+        self.assertFalse(Port.is_reference_html_file(filesystem, '', 'foo-expected.shtml'))
+        self.assertFalse(Port.is_reference_html_file(filesystem, '', 'foo-expected.php'))
+        self.assertFalse(Port.is_reference_html_file(filesystem, '', 'foo-expected.mht'))
+
     def test_parse_reftest_list(self):
         port = self.make_port(with_tests=True)