Changeset 121784 in webkit

Timestamp:

Jul 3, 2012 10:21:52 AM (12 years ago)

Author:

ojan@chromium.org

Message:

Make the skia_test_expectations.txt file optional.
​https://bugs.webkit.org/show_bug.cgi?id=90400

Reviewed by Dirk Pranke.

It used to be optional. This regressed at some point. It's important that it be
optional so that webkit-patch commands work in a pure-webkit checkout for chromium bots.
Specifically, this was breaking webkit-patch rebaseline-test when it would go to update
TestExpectations.

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

(ChromiumPort.expectations_files):

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

(ChromiumDriverTest.test_expectations_dict):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/rebaseline_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-02  Ojan Vafai  <ojan@chromium.org>
+
+        Make the skia_test_expectations.txt file optional.
+        https://bugs.webkit.org/show_bug.cgi?id=90400
+
+        Reviewed by Dirk Pranke.
+
+        It used to be optional. This regressed at some point. It's important that it be
+        optional so that webkit-patch commands work in a pure-webkit checkout for chromium bots.
+        Specifically, this was breaking webkit-patch rebaseline-test when it would go to update
+        TestExpectations.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        (ChromiumPort.expectations_files):
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+        (ChromiumDriverTest.test_expectations_dict):
+
 2012-07-03  Raphael Kubo da Costa  <rakuco@webkit.org>
 

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

@@ -346 +346 @@
 
     def expectations_files(self):
-        paths = [self.path_to_test_expectations_file(), self.path_from_chromium_base('skia', 'skia_test_expectations.txt')]
+        paths = [self.path_to_test_expectations_file()]
+        skia_expectations_path = self.path_from_chromium_base('skia', 'skia_test_expectations.txt')
+        if self._filesystem.exists(skia_expectations_path):
+            paths.append(skia_expectations_path)
+        else:
+            _log.warning("Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.")
+
         builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME')
         if builder_name == 'DUMMY_BUILDER_NAME' or '(deps)' in builder_name or builder_name in self.try_builder_names:

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

@@ -165 +165 @@
             'skia', 'skia_test_expectations.txt')
 
+        port._filesystem.write_text_file(skia_overrides_path, 'dummay text')
+
         port._options.builder_name = 'DUMMY_BUILDER_NAME'
         self.assertEquals(port.expectations_files(), [expectations_path, skia_overrides_path, chromium_overrides_path])

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

@@ -171 +171 @@
         self.assertFalse(self.port._filesystem.isdir(last_tmpdir))
 
+    def test_expectations_dict(self):
+        self.port._filesystem.write_text_file('/mock-checkout/LayoutTests/platform/chromium/TestExpectations', 'upstream')
+        self.port._filesystem.write_text_file('/mock-checkout/Source/WebKit/chromium/webkit/tools/layout_tests/test_expectations.txt', 'downstream')
+        self.assertEquals('\n'.join(self.port.expectations_dict().values()), 'upstream\ndownstream')
+
+        self.port._filesystem.write_text_file(self.port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), 'skia')
+        self.assertEquals('\n'.join(self.port.expectations_dict().values()), 'upstream\nskia\ndownstream')
+
 
 class ChromiumPortLoggingTest(logtesting.LoggingTestCase):

trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

@@ -75 +75 @@
 Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.wav.
 Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
 """
         OutputCapture().assert_outputs(self, command._rebaseline_test_and_update_expectations, ["Webkit Mac10.7", "userscripts/another-test.html", None], expected_logs=expected_logs)
@@ -273 +274 @@
     userscripts/another-test.html (txt)
     userscripts/images.svg (png)
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
+Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.
 """