Changeset 171167 in webkit

Timestamp:

Jul 16, 2014 7:26:41 PM (10 years ago)

Author:

ap@apple.com

Message:

A test that hangs at cleanup stage confuses webkitpy hugely
​https://bugs.webkit.org/show_bug.cgi?id=122475
<rdar://problem/17184354>

Reviewed by Anders Carlsson.

Source/WebKit2:
Reset m_pageLoadState when the process exits cleanly - otherwise messages from a
new process for the same WebPageProxy would hit assertions.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::processDidCrash):
(WebKit::WebPageProxy::resetStateAfterProcessExited):

Tools:
Terminate WebContent process if it freezes between tests. Ideally, we should report
this somehow, but this is better than blaming the wrong test.

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::terminateWebContentProcess):

• WebKitTestRunner/TestController.h:
• WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::invoke):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-16  Alexey Proskuryakov  <ap@apple.com>
+
+        A test that hangs at cleanup stage confuses webkitpy hugely
+        https://bugs.webkit.org/show_bug.cgi?id=122475
+        <rdar://problem/17184354>
+
+        Reviewed by Anders Carlsson.
+
+        Reset m_pageLoadState when the process exits cleanly - otherwise messages from a
+        new process for the same WebPageProxy would hit assertions.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processDidCrash):
+        (WebKit::WebPageProxy::resetStateAfterProcessExited):
+
 2014-07-16  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4276 +4276 @@
     resetStateAfterProcessExited();
 
-    // FIXME: Should we do this when the process exits cleanly, instead of just upon crashing?
-    auto transaction = m_pageLoadState.transaction();
-    m_pageLoadState.reset(transaction);
-
     m_loaderClient->processDidCrash(this);
 }
@@ -4434 +4430 @@
     m_pageClient.dismissDictionaryLookupPanel();
 #endif
+
+    auto transaction = m_pageLoadState.transaction();
+    m_pageLoadState.reset(transaction);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2014-07-16  Alexey Proskuryakov  <ap@apple.com>
+
+        A test that hangs at cleanup stage confuses webkitpy hugely
+        https://bugs.webkit.org/show_bug.cgi?id=122475
+        <rdar://problem/17184354>
+
+        Reviewed by Anders Carlsson.
+
+        Terminate WebContent process if it freezes between tests. Ideally, we should report
+        this somehow, but this is better than blaming the wrong test.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::terminateWebContentProcess):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::invoke):
+
 2014-07-16  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -669 +669 @@
 }
 
+void TestController::terminateWebContentProcess()
+{
+    WKPageTerminate(m_mainWebView->page());
+}
 
 void TestController::updateWebViewSizeForTest(const TestInvocation& test)

trunk/Tools/WebKitTestRunner/TestController.h

@@ -98 +98 @@
     void resetPreferencesToConsistentValues();
 
+    void terminateWebContentProcess();
+
     WorkQueueManager& workQueueManager() { return m_workQueueManager; }
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -203 +203 @@
         dumpWebProcessUnresponsiveness();
     else if (!TestController::shared().resetStateToConsistentValues()) {
-        m_errorMessage = "Timed out loading about:blank before the next test";
-        dumpWebProcessUnresponsiveness();
+        // 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::shared().terminateWebContentProcess();
+        TestController::shared().resetStateToConsistentValues();
     }
 }