Changeset 90285 in webkit

Timestamp:

Jul 1, 2011 3:11:46 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-07-01 Eric Seidel <​eric@webkit.org>

new-run-webkit-tests results does not understand that mac uses test_expectations files
​https://bugs.webkit.org/show_bug.cgi?id=63838

Reviewed by Adam Barth.

We've decided to "enable" test_expectations for the Mac port for now.
It makes the results.html results much more confusing to read, but at least they're
no longer lying to us.

• Scripts/webkitpy/layout_tests/layout_package/manager.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/base_unittest.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-01  Eric Seidel  <eric@webkit.org>
+
+        new-run-webkit-tests results does not understand that mac uses test_expectations files
+        https://bugs.webkit.org/show_bug.cgi?id=63838
+
+        Reviewed by Adam Barth.
+
+        We've decided to "enable" test_expectations for the Mac port for now.
+        It makes the results.html results much more confusing to read, but at least they're
+        no longer lying to us.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+
 2011-07-01  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@ -207 +207 @@
     results['num_flaky'] = num_flaky
     results['num_regressions'] = num_regressions
-    # FIXME: If non-chromium ports start using an expectations file,
-    # we should make this check more robust.
-    results['uses_expectations_file'] = port_obj.name().find('chromium') != -1
+    results['uses_expectations_file'] = port_obj.uses_test_expectations_file()
     results['layout_tests_dir'] = port_obj.layout_tests_dir()
     results['has_wdiff'] = port_obj.wdiff_available()

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

@@ -712 +712 @@
         raise NotImplementedError
 
+    def uses_test_expectations_file(self):
+        # This is different from checking test_expectations() is None, because
+        # some ports have Skipped files which are returned as part of test_expectations().
+        return self._filesystem.exists(self.path_to_test_expectations_file())
+
     def test_expectations(self):
         """Returns the test expectations for this port.

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

@@ -208 +208 @@
             path = test_file
 
-        self.assertEqual(port.filename_to_uri(test_file),
-                         abspath_to_uri(test_file))
+        self.assertEqual(port.filename_to_uri(test_file), abspath_to_uri(test_file))
 
     def test_get_option__set(self):
@@ -235 +234 @@
     def test_additional_platform_directory(self):
         filesystem = MockFileSystem()
-        options, args = optparse.OptionParser().parse_args([])
-        port = base.Port(port_name='foo', filesystem=filesystem, options=options)
+        port = base.Port(port_name='foo', filesystem=filesystem)
         port.baseline_search_path = lambda: ['LayoutTests/platform/foo']
         layout_test_dir = port.layout_tests_dir()
@@ -248 +246 @@
 
         # Simple additional platform directory
-        options.additional_platform_directory = ['/tmp/local-baselines']
+        port._options.additional_platform_directory = ['/tmp/local-baselines']
         filesystem.files = {
             '/tmp/local-baselines/fast/test-expected.txt': 'foo',
@@ -258 +256 @@
 
         # Multiple additional platform directories
-        options.additional_platform_directory = ['/foo', '/tmp/local-baselines']
+        port._options.additional_platform_directory = ['/foo', '/tmp/local-baselines']
         self.assertEqual(
             port.expected_baselines(test_file, '.txt'),
             [('/tmp/local-baselines', 'fast/test-expected.txt')])
         self.assertEqual(port.baseline_path(), '/foo')
+
+    def test_uses_test_expectations_file(self):
+        filesystem = MockFileSystem()
+        port = base.Port(port_name='foo', filesystem=filesystem)
+        port.path_to_test_expectations_file = lambda: '/mock/test_expectations.txt'
+        self.assertFalse(port.uses_test_expectations_file())
+        port._filesystem = MockFileSystem({'/mock/test_expectations.txt': ''})
+        self.assertTrue(port.uses_test_expectations_file())
+
 
 class VirtualTest(unittest.TestCase):