Changeset 106692 in webkit

Timestamp:

Feb 3, 2012, 1:48:35 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

Ref Tests should support plain SVG files
​https://bugs.webkit.org/show_bug.cgi?id=77685

Reviewed by Tony Chang.

Don't assume reference files always use .html as the extension.
Instead, use the list of supported extension to look for -expected.* and -mismatch.*

Also fix various bugs in MockFileSystem and TestPort.

• Scripts/webkitpy/common/system/filesystem_mock.py:

(MockFileSystem.isdir):

• Scripts/webkitpy/layout_tests/port/base.py:

(Port.reference_files):

• Scripts/webkitpy/layout_tests/port/base_unittest.py:

(PortTest.test_is_test_file):
(PortTest.test_reference_files):

• Scripts/webkitpy/layout_tests/port/test.py:

(TestInstance.init):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem_mock.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mock_drt.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (3 diffs)
• Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-03  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Ref Tests should support plain SVG files
+        https://bugs.webkit.org/show_bug.cgi?id=77685
+
+        Reviewed by Tony Chang.
+
+        Don't assume reference files always use .html as the extension.
+        Instead, use the list of supported extension to look for -expected.* and -mismatch.*
+
+        Also fix various bugs in MockFileSystem and TestPort.
+
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        (MockFileSystem.isdir):
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port.reference_files):
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+        (PortTest.test_is_test_file):
+        (PortTest.test_reference_files):
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        (TestInstance.__init__):
+
 2012-02-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

@@ -181 +181 @@
         # mid-iteration.
         files = self.files.keys()[:]
-        result = any(f.startswith(path) for f in files)
+        result = any(f.startswith(path) and len(self.split(f)[0]) >= len(path) for f in files)
         if result:
             self.dirs.add(path)

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

@@ -469 +469 @@
         reftest_list = self._get_reftest_list(test_name)
         if not reftest_list:
-            expected_filenames = [('==', self.expected_filename(test_name, '.html')), ('!=', self.expected_filename(test_name, '-mismatch.html'))]
-            return [(expectation, filename) for expectation, filename in expected_filenames if self._filesystem.exists(filename)]
+            reftest_list = []
+            for expectation, prefix in (('==', ''), ('!=', '-mismatch')):
+                for extention in Port._supported_file_extensions:
+                    path = self.expected_filename(test_name, prefix + extention)
+                    if self._filesystem.exists(path):
+                        reftest_list.append((expectation, path))
+            return reftest_list
 
         return reftest_list.get(self._filesystem.join(self.layout_tests_dir(), test_name), [])
-
-    def is_reftest(self, test_name):
-        reftest_list = self._get_reftest_list(test_name)
-        if not reftest_list:
-            has_expected = self._filesystem.exists(self.expected_filename(test_name, '.html'))
-            return has_expected or self._filesystem.exists(self.expected_filename(test_name, '-mismatch.html'))
-        filename = self._filesystem.join(self.layout_tests_dir(), test_name)
-        return filename in reftest_list
 
     def tests(self, paths):

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

@@ -325 +325 @@
         self.assertTrue(Port._is_test_file(filesystem, '', 'foo.html'))
         self.assertTrue(Port._is_test_file(filesystem, '', 'foo.shtml'))
+        self.assertTrue(Port._is_test_file(filesystem, '', 'foo.svg'))
         self.assertTrue(Port._is_test_file(filesystem, '', 'test-ref-test.html'))
         self.assertFalse(Port._is_test_file(filesystem, '', 'foo.png'))
         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.html'))
+        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.svg'))
+        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.xht'))
         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.html'))
+        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.svg'))
+        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.xhtml'))
         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-ref.html'))
         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-notref.html'))
@@ -350 +355 @@
             'bar/test-2.html': [('!=', 'bar/test-notref.html')],
             'bar/test-3.html': [('==', 'bar/test-ref.html'), ('==', 'bar/test-ref2.html'), ('!=', 'bar/test-notref.html')]})
+
+    def test_reference_files(self):
+        port = self.make_port(with_tests=True)
+        self.assertEqual(port.reference_files('passes/svgreftest.svg'), [('==', '/test.checkout/LayoutTests/passes/svgreftest-expected.svg')])
+        self.assertEqual(port.reference_files('passes/xhtreftest.svg'), [('==', '/test.checkout/LayoutTests/passes/xhtreftest-expected.html')])
+        self.assertEqual(port.reference_files('passes/phpreftest.php'), [('!=', '/test.checkout/LayoutTests/passes/phpreftest-expected-mismatch.svg')])
 
     def test_operating_system(self):

trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py

@@ -204 +204 @@
             test_name = self._port.relative_test_filename(uri)
 
-        is_reftest = (self._port.is_reftest(test_name) or
+        is_reftest = (self._port.reference_files(test_name) or
                       test_name.endswith('-expected.html') or
                       test_name.endswith('-mismatch.html'))
@@ -268 +268 @@
 
         test_name = self._driver.uri_to_test(uri)
-        is_reftest = (self._port.is_reftest(test_name) or
+        is_reftest = (self._port.reference_files(test_name) or
                       test_name.endswith('-expected.html') or
                       test_name.endswith('-mismatch.html'))

trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py

@@ -45 +45 @@
     def __init__(self, name):
         self.name = name
-        self.base = name[(name.rfind("/") + 1):name.rfind(".html")]
+        self.base = name[(name.rfind("/") + 1):name.rfind(".")]
         self.crash = False
         self.web_process_crash = False
@@ -183 +183 @@
     tests.add_reftest('passes/reftest.html', 'passes/reftest-expected.html', same_image=True)
     tests.add_reftest('passes/mismatch.html', 'passes/mismatch-expected-mismatch.html', same_image=False)
+    tests.add_reftest('passes/svgreftest.svg', 'passes/svgreftest-expected.svg', same_image=True)
+    tests.add_reftest('passes/xhtreftest.xht', 'passes/xhtreftest-expected.html', same_image=True)
+    tests.add_reftest('passes/phpreftest.php', 'passes/phpreftest-expected-mismatch.svg', same_image=False)
     tests.add_reftest('failures/expected/reftest.html', 'failures/expected/reftest-expected.html', same_image=False)
     tests.add_reftest('failures/expected/mismatch.html', 'failures/expected/mismatch-expected-mismatch.html', same_image=True)
@@ -293 +296 @@
     test_list = unit_test_list()
     for test in test_list.tests.values():
-        add_file(test, '.html', '')
+        add_file(test, test.name[test.name.rfind('.'):], '')
         if test.is_reftest:
             continue

trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py

@@ -248 +248 @@
         fs = self._target_port._filesystem
         for test in self._rebaselining_tests:
-            if self._target_port.is_reftest(test):
+            if self._target_port.reference_files(test):
                 _log.error('%s seems to be a reftest. We can not rebase for reftests.', test)
                 self._rebaselining_tests = set()