Changeset 201263 in webkit

Timestamp:

May 22, 2016 3:55:23 PM (8 years ago)

Author:

ap@apple.com

Message:

RELEASE_ASSERT(TestController::singleton().isCurrentInvocation(testInvocation)) is sometimes hit when running tests
​https://bugs.webkit.org/show_bug.cgi?id=157977
rdar://problem/20874156

Reviewed by David Kilzer.

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::invoke): Be more certain to launch a new process when there was
a timeout detected. If we don't, there is a chance that the process is not quite frozen,
and will still send a response that we no longer expect.
(WTR::TestInvocation::dumpWebProcessUnresponsiveness): Print timeout details to stderr
too, as stdout is not available, at least not in the case that I was observing.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-05-22  Alexey Proskuryakov  <ap@apple.com>
+
+        RELEASE_ASSERT(TestController::singleton().isCurrentInvocation(testInvocation)) is sometimes hit when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=157977
+        rdar://problem/20874156
+
+        Reviewed by David Kilzer.
+
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::invoke): Be more certain to launch a new process when there was
+        a timeout detected. If we don't, there is a chance that the process is not quite frozen,
+        and will still send a response that we no longer expect.
+        (WTR::TestInvocation::dumpWebProcessUnresponsiveness): Print timeout details to stderr
+        too, as stdout is not available, at least not in the case that I was observing.
+
 2016-05-22  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -173 +173 @@
     if (m_webProcessIsUnresponsive)
         dumpWebProcessUnresponsiveness();
-    else if (!TestController::singleton().resetStateToConsistentValues(m_options)) {
-        // The process froze while loading about:blank, let's start a fresh one.
-        // It would be nice to report that the previous test froze after dumping results, but we have no way to do that.
-        TestController::singleton().terminateWebContentProcess();
-        // Make sure that we have a process, as invoke() will need one to send bundle messages for the next test.
-        TestController::singleton().reattachPageToWebProcess();
-    }
+    else if (TestController::singleton().resetStateToConsistentValues(m_options))
+        return;
+    else
+        dumpWebProcessUnresponsiveness("TestController::resetStateToConsistentValues failed\n");
+
+    // The process is unresponsive, so let's start a new one.
+    TestController::singleton().terminateWebContentProcess();
+    // Make sure that we have a process, as invoke() will need one to send bundle messages for the next test.
+    TestController::singleton().reattachPageToWebProcess();
 }
 
@@ -189 +191 @@
 void TestInvocation::dumpWebProcessUnresponsiveness(const char* errorMessage)
 {
+    fprintf(stderr, "%s", errorMessage);
     char errorMessageToStderr[1024];
 #if PLATFORM(COCOA)