Changeset 90184 in webkit

Timestamp:

Jun 30, 2011 4:40:32 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-30 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Clean up output from new-run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=63759

Printing messages from the child process looks super ugly because of
the way the pretty-printer works. Printing a blank line first is a
hack, but it makes things at least partially sane.

Also, handle the case where calling sample throws an exception.

• Scripts/webkitpy/layout_tests/port/server_process.py:
• Scripts/webkitpy/layout_tests/port/server_process_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/server_process.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/server_process_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-30  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Clean up output from new-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=63759
+
+        Printing messages from the child process looks super ugly because of
+        the way the pretty-printer works.  Printing a blank line first is a
+        hack, but it makes things at least partially sane.
+
+        Also, handle the case where calling sample throws an exception.
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+        * Scripts/webkitpy/layout_tests/port/server_process_unittest.py:
+
 2011-06-27  Diego Gonzalez  <diegohcg@webkit.org>
 

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

@@ -40 +40 @@
     import fcntl
 
-from webkitpy.common.system.executive import Executive
+from webkitpy.common.system.executive import Executive, ScriptError
 
 _log = logging.getLogger(__file__)
@@ -167 +167 @@
             self.handle_interrupt()
 
+    def _log(self, message):
+        # This is a bit of a hack, but we first log a blank line to avoid
+        # messing up the master process's output.
+        _log.info('')
+        _log.info(message)
+
     def _sample(self):
         if sys.platform != "darwin":
             return
-        _log.warning('Sampling process... (use --no-sample-on-timeout to skip this step)')
-        hang_report = os.path.join(self._port.results_directory(), "%s-%s.sample.txt" % (self._name, self._proc.pid))
-        self._executive.run_command([
-            "/usr/bin/sample",
-            self._proc.pid,
-            10,
-            10,
-            "-file",
-            hang_report,
-        ])
+        try:
+            self._log('Sampling %s process... (use --no-sample-on-timeout to skip this step)' % self._name)
+            hang_report = os.path.join(self._port.results_directory(), "%s-%s.sample.txt" % (self._name, self._proc.pid))
+            self._executive.run_command([
+                "/usr/bin/sample",
+                self._proc.pid,
+                10,
+                10,
+                "-file",
+                hang_report,
+            ])
+        except ScriptError, e:
+            self._log('Unable to sample process.')
 
     def _read(self, timeout, size):
@@ -194 +203 @@
             if now > deadline:
                 if self._executive.running_pids(self._port.is_crash_reporter):
-                    _log.warning('Waiting for crash reporter...')
+                    self._log('Waiting for crash reporter...')
                     self._executive.wait_newest(self._port.is_crash_reporter)
                     if not self.crashed:

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

@@ -31 +31 @@
 
 from webkitpy.layout_tests.port import server_process
+from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
@@ -37 +38 @@
 def _logging_run_command(args):
     print args
+
+
+def _throwing_run_command(args):
+    raise ScriptError("MOCK script error")
 
 
@@ -93 +98 @@
         expected_stdout = "['/usr/bin/sample', 1, 10, 10, '-file', '/mock/results/test-1.sample.txt']\n"
         OutputCapture().assert_outputs(self, server_process._sample, expected_stdout=expected_stdout)
+
+    def test_sample_process_throws_exception(self):
+        # Currently, sample-on-timeout only works on Darwin.
+        if sys.platform != "darwin":
+            return
+        server_process = FakeServerProcess(port_obj=TrivialMockPort(), name="test", cmd=["test"], executive=MockExecutive2(run_command_fn=_throwing_run_command))
+        server_process._proc = MockProc(server_process)
+        OutputCapture().assert_outputs(self, server_process._sample)