Changeset 119018 in webkit

Timestamp:

May 30, 2012, 6:51:50 PM (13 years ago)

Author:

Stephanie Lewis

Message:

​https://bugs.webkit.org/show_bug.cgi?id=87717
Unresponsive WebProcesses can be mistaken for WebProcess crashes.

Reviewed by Dirk Pranke.

Change the error message from #CRASHED to #UNRESPONSIVE PROCESS
If there isn't a crash log found for the process add a message saying
the process was unresponsive.

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

(WebKitDriver.init):
(WebKitDriver._check_for_driver_crash):
(WebKitDriver.run_test):

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

(WebKitDriverTest.test_check_for_driver_crash.assert_crash):
(WebKitDriverTest):
(WebKitDriverTest.test_check_for_driver_crash):

• WebKitTestRunner/TestController.cpp:

(WTR):
(WTR::TestController::runTest):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py (modified) (4 diffs)
• WebKitTestRunner/TestController.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-30  Stephanie Lewis  <slewis@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=87717
+        Unresponsive WebProcesses can be mistaken for WebProcess crashes.
+
+        Reviewed by Dirk Pranke.
+
+        Change the error message from #CRASHED to #UNRESPONSIVE PROCESS
+        If there isn't a crash log found for the process add a message saying
+        the process was unresponsive.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        (WebKitDriver.__init__):
+        (WebKitDriver._check_for_driver_crash):
+        (WebKitDriver.run_test):
+        * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+        (WebKitDriverTest.test_check_for_driver_crash.assert_crash):
+        (WebKitDriverTest):
+        (WebKitDriverTest.test_check_for_driver_crash):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR):
+        (WTR::TestController::runTest):
+
 2012-05-30  Stephanie Lewis  <slewis@apple.com>
 

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

@@ -450 +450 @@
         self._crashed_pid = None
 
+        # WebKitTestRunner can report back subprocesses that became unresponsive
+        # This could mean they crashed.
+        self._subprocess_was_unresponsive = False
+
         # stderr reading is scoped on a per-test (not per-block) basis, so we store the accumulated
         # stderr output, as well as if we've seen #EOF on this driver instance.
@@ -514 +518 @@
             self._crashed_process_name = self._server_process.name()
             self._crashed_pid = self._server_process.pid()
-        elif error_line.startswith("#CRASHED - WebProcess"):
+        elif (error_line.startswith("#CRASHED - WebProcess")
+            or error_line.startswith("#PROCESS UNRESPONSIVE - WebProcess")):
             # WebKitTestRunner uses this to report that the WebProcess subprocess crashed.
             pid = None
@@ -524 +529 @@
             # FIXME: delete this after we're sure this code is working :)
             _log.debug('WebProcess crash, pid = %s, error_line = %s' % (str(pid), error_line))
+            if error_line.startswith("#PROCESS UNRESPONSIVE - WebProcess"):
+                self._subprocess_was_unresponsive = True
             return True
         return self.has_crashed()
@@ -582 +589 @@
             if not crash_log:
                 crash_log = 'no crash log found for %s:%d.' % (self._crashed_process_name, self._crashed_pid)
+                # If we were unresponsive append a message informing there may not have been a crash.
+                if self._subprocess_was_unresponsive:
+                    crash_log += '  Process failed to become responsive before timing out.'
 
         timeout = self._server_process.timed_out

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

@@ -323 +323 @@
                 pass
 
-        def assert_crash(driver, error_line, crashed, name, pid):
+        def assert_crash(driver, error_line, crashed, name, pid, unresponsive=False):
             self.assertEquals(driver._check_for_driver_crash(error_line), crashed)
             self.assertEquals(driver._crashed_process_name, name)
             self.assertEquals(driver._crashed_pid, pid)
+            self.assertEquals(driver._subprocess_was_unresponsive, unresponsive)
             driver.stop()
 
@@ -335 +336 @@
         driver._crashed_pid = None
         driver._server_process = FakeServerProcess(False)
+        driver._subprocess_was_unresponsive = False
         assert_crash(driver, '#CRASHED\n', True, 'FakeServerProcess', 1234)
 
@@ -340 +342 @@
         driver._crashed_pid = None
         driver._server_process = FakeServerProcess(False)
+        driver._subprocess_was_unresponsive = False
         assert_crash(driver, '#CRASHED - WebProcess\n', True, 'WebProcess', None)
 
@@ -345 +348 @@
         driver._crashed_pid = None
         driver._server_process = FakeServerProcess(False)
+        driver._subprocess_was_unresponsive = False
         assert_crash(driver, '#CRASHED - WebProcess (pid 8675)\n', True, 'WebProcess', 8675)
+        
+        driver._crashed_process_name = None
+        driver._crashed_pid = None
+        driver._server_process = FakeServerProcess(False)
+        driver._subprocess_was_unresponsive = False
+        assert_crash(driver, '#PROCESS UNRESPONSIVE - WebProcess (pid 8675)\n', True, 'WebProcess', 8675, True)
 
         driver._crashed_process_name = None
         driver._crashed_pid = None
         driver._server_process = FakeServerProcess(True)
+        driver._subprocess_was_unresponsive = False
         assert_crash(driver, '', True, 'FakeServerProcess', 1234)
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -499 +499 @@
 #if PLATFORM(MAC)
         pid_t pid = WKPageGetProcessIdentifier(m_mainWebView->page());
-        fprintf(stderr, "#CRASHED - WebProcess (pid %ld)\n", static_cast<long>(pid));
+        fprintf(stderr, "#PROCESS UNRESPONSIVE - WebProcess (pid %ld)\n", static_cast<long>(pid));
 #else
-        fputs("#CRASHED - WebProcess\n", stderr);
+        fputs("#PROCESS UNRESPONSIVE - WebProcess\n", stderr);
 #endif
         fflush(stderr);