Changeset 127057 in webkit

Timestamp:

Aug 29, 2012 3:23:33 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

webkit-patch rebaseline-expectations hangs
​https://bugs.webkit.org/show_bug.cgi?id=95243

Reviewed by Tony Chang.

Don't try to run no commands in parallel; report an error
instead that we didn't find any tests to rebaseline.

Filed bug 95387 as well to make sure run_in_parallel() doesn't hang forever.

• Scripts/webkitpy/tool/commands/rebaseline.py:

(RebaselineExpectations.execute):

• Scripts/webkitpy/tool/commands/rebaseline_unittest.py:

(_assert_command):
(test_rebaseline_expectations_noop):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/rebaseline.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/rebaseline_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-29  Dirk Pranke  <dpranke@chromium.org>
+
+        webkit-patch rebaseline-expectations hangs
+        https://bugs.webkit.org/show_bug.cgi?id=95243
+
+        Reviewed by Tony Chang.
+
+        Don't try to run no commands in parallel; report an error
+        instead that we didn't find any tests to rebaseline.
+
+        Filed bug 95387 as well to make sure run_in_parallel() doesn't hang forever.
+
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        (RebaselineExpectations.execute):
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+        (_assert_command):
+        (test_rebaseline_expectations_noop):
+
 2012-08-29  Brady Eidson  <beidson@apple.com>
 

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

@@ -356 +356 @@
         for port_name in tool.port_factory.all_port_names():
             self._add_tests_to_rebaseline_for_port(port_name)
+        if not self._test_list:
+            _log.warning("Did not find any tests marked REBASELINE.")
+            return
+
         self._rebaseline(options, self._test_list)
 

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

@@ -313 +313 @@
         OutputCapture().assert_outputs(self, command.execute, [MockOptions(optimize=True), [], tool], expected_logs=expected_logs, expected_stdout=expected_stdout, expected_stderr=expected_stderr_with_optimize)
 
+    def _assert_command(self, command, options=None, args=None, expected_stdout='', expected_stderr='', expected_logs=''):
+        # FIXME: generalize so more tests use this to get rid of boilerplate.
+        options = options or MockOptions(optimize=True, builders=None, suffixes=['txt'], verbose=False)
+        args = args or []
+
+        tool = MockTool()
+        command.bind_to_tool(tool)
+
+        port = tool.port_factory.get('chromium-mac-lion')
+        tool.filesystem.write_text_file(port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
+
+        for port_name in tool.port_factory.all_port_names():
+            port = tool.port_factory.get(port_name)
+            for path in port.expectations_files():
+                tool.filesystem.write_text_file(path, '')
+
+        OutputCapture().assert_outputs(self, command.execute, [options, args, tool], expected_stdout=expected_stdout, expected_stderr=expected_stderr, expected_logs=expected_logs)
+
+    def test_rebaseline_expectations_noop(self):
+        self._assert_command(RebaselineExpectations(), expected_logs='Did not find any tests marked REBASELINE.\n')
+
     def test_overrides_are_included_correctly(self):
         command = RebaselineExpectations()