Title: [177598] trunk
- Revision
- 177598
- Author
- [email protected]
- Date
- 2014-12-19 15:25:46 -0800 (Fri, 19 Dec 2014)
Log Message
REGRESSION (177368): Some tests started to immediately time out
https://bugs.webkit.org/show_bug.cgi?id=139826
Reviewed by Daniel Bates.
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::done):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::dump):
Move invalidateWaitToDumpWatchdogTimer() call from dump() to done(). When a test
ends in a load failure, we don't dump, so we used to leak the timer.
* WebKitTestRunner/InjectedBundle/TestRunner.cpp: (WTR::TestRunner::notifyDone):
Added a comment.
LayoutTests:
* platform/wk2/TestExpectations: The culprit was this test that I unskipped to see
whether it passes. It in fact does pass, so let's remove the expectation entirely.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (177597 => 177598)
--- trunk/LayoutTests/ChangeLog 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/LayoutTests/ChangeLog 2014-12-19 23:25:46 UTC (rev 177598)
@@ -1,3 +1,13 @@
+2014-12-19 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (177368): Some tests started to immediately time out
+ https://bugs.webkit.org/show_bug.cgi?id=139826
+
+ Reviewed by Daniel Bates.
+
+ * platform/wk2/TestExpectations: The culprit was this test that I unskipped to see
+ whether it passes. It in fact does pass, so let's remove the expectation entirely.
+
2014-12-19 Brent Fulgham <[email protected]>
[Win] Unreviewed gardening.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (177597 => 177598)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-12-19 23:25:46 UTC (rev 177598)
@@ -76,9 +76,6 @@
webkit.org/b/82665 webarchive/test-css-url-resources-in-stylesheets.html [ Skip ]
webkit.org/b/82665 webarchive/test-css-url-resources-inline-styles.html [ Skip ]
-# This test has been skipped for a long time. Temporarily marking as flaky to see what bots think.
-webkit.org/b/96741 fast/loader/recursive-before-unload-crash.html [ Pass Failure ]
-
# WebKitTestRunner needs textInputController
# <https://bugs.webkit.org/show_bug.cgi?id=42337>
editing/input/setting-input-value-cancel-ime-composition.html
Modified: trunk/Tools/ChangeLog (177597 => 177598)
--- trunk/Tools/ChangeLog 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/Tools/ChangeLog 2014-12-19 23:25:46 UTC (rev 177598)
@@ -1,3 +1,18 @@
+2014-12-19 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (177368): Some tests started to immediately time out
+ https://bugs.webkit.org/show_bug.cgi?id=139826
+
+ Reviewed by Daniel Bates.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::done):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::dump):
+ Move invalidateWaitToDumpWatchdogTimer() call from dump() to done(). When a test
+ ends in a load failure, we don't dump, so we used to leak the timer.
+
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp: (WTR::TestRunner::notifyDone):
+ Added a comment.
+
2014-12-19 Brent Fulgham <[email protected]>
[Win] Add accessor for serializing HTTP loads
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (177597 => 177598)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-19 23:25:46 UTC (rev 177598)
@@ -289,6 +289,8 @@
page()->stopLoading();
setTopLoadingFrame(0);
+ m_testRunner->invalidateWaitToDumpWatchdogTimer();
+
m_accessibilityController->resetToConsistentState();
WKRetainPtr<WKStringRef> doneMessageName(AdoptWK, WKStringCreateWithUTF8CString("Done"));
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (177597 => 177598)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-12-19 23:25:46 UTC (rev 177598)
@@ -836,8 +836,6 @@
{
ASSERT(InjectedBundle::shared().isTestRunning());
- InjectedBundle::shared().testRunner()->invalidateWaitToDumpWatchdogTimer();
-
// Force a paint before dumping. This matches DumpRenderTree on Windows. (DumpRenderTree on Mac
// does this at a slightly different time.) See <http://webkit.org/b/55469> for details.
WKBundlePageForceRepaint(m_page);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (177597 => 177598)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-12-19 22:14:20 UTC (rev 177597)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-12-19 23:25:46 UTC (rev 177598)
@@ -160,6 +160,10 @@
if (m_waitToDump && !InjectedBundle::shared().topLoadingFrame())
InjectedBundle::shared().page()->dump();
+ // We don't call invalidateWaitToDumpWatchdogTimer() here, even if we continue to wait for a load to finish.
+ // The test is still subject to timeout checking - it is better to detect an async timeout inside WebKitTestRunner
+ // than to let webkitpy do that, because WebKitTestRunner will dump partial results.
+
m_waitToDump = false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
