Title: [234819] trunk/Tools
- Revision
- 234819
- Author
- [email protected]
- Date
- 2018-08-13 15:16:39 -0700 (Mon, 13 Aug 2018)
Log Message
Avoid timeout resulted from calling waitUntilDone when test is not running
https://bugs.webkit.org/show_bug.cgi?id=188389
Reviewed by Chris Dumez.
If test is not running, we should not set the waitUntilDone flag, or it may cause subsequent tests timeout.
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::waitUntilDone):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (234818 => 234819)
--- trunk/Tools/ChangeLog 2018-08-13 22:02:45 UTC (rev 234818)
+++ trunk/Tools/ChangeLog 2018-08-13 22:16:39 UTC (rev 234819)
@@ -1,3 +1,15 @@
+2018-08-13 Sihui Liu <[email protected]>
+
+ Avoid timeout resulted from calling waitUntilDone when test is not running
+ https://bugs.webkit.org/show_bug.cgi?id=188389
+
+ Reviewed by Chris Dumez.
+
+ If test is not running, we should not set the waitUntilDone flag, or it may cause subsequent tests timeout.
+
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::waitUntilDone):
+
2018-08-13 Wenson Hsieh <[email protected]>
[WK2] [macOS] Implement a mechanism to test drag and drop
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (234818 => 234819)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2018-08-13 22:02:45 UTC (rev 234818)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2018-08-13 22:16:39 UTC (rev 234819)
@@ -185,9 +185,12 @@
void TestRunner::waitUntilDone()
{
+ auto& injectedBundle = InjectedBundle::singleton();
+ RELEASE_ASSERT(injectedBundle.isTestRunning());
+
setWaitUntilDone(true);
// FIXME: Watchdog timer should be moved to UI process in order to take the elapsed time in anotehr process into account.
- if (InjectedBundle::singleton().useWaitToDumpWatchdogTimer())
+ if (injectedBundle.useWaitToDumpWatchdogTimer())
initializeWaitToDumpWatchdogTimerIfNeeded();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
