Title: [190133] trunk/Tools
- Revision
- 190133
- Author
- aes...@apple.com
- Date
- 2015-09-22 14:11:35 -0700 (Tue, 22 Sep 2015)
Log Message
ContentFiltering.AllowDownloadAfterAddData is very flaky
https://bugs.webkit.org/show_bug.cgi?id=148885
<rdar://problem/22729563>
Reviewed by Alexey Proskuryakov.
The AllowDownload* tests were relying on -_downloadDidStart: being called before -webView:didFinishNavigation:,
but there is no guarantee of this. For tests that should allow a download, spin the runloop until
-_downloadDidStart: is called. The test will now timeout on failure, but will no longer produce false failures.
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:
(downloadTest):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190132 => 190133)
--- trunk/Tools/ChangeLog 2015-09-22 21:08:40 UTC (rev 190132)
+++ trunk/Tools/ChangeLog 2015-09-22 21:11:35 UTC (rev 190133)
@@ -1,3 +1,18 @@
+2015-09-22 Andy Estes <aes...@apple.com>
+
+ ContentFiltering.AllowDownloadAfterAddData is very flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148885
+ <rdar://problem/22729563>
+
+ Reviewed by Alexey Proskuryakov.
+
+ The AllowDownload* tests were relying on -_downloadDidStart: being called before -webView:didFinishNavigation:,
+ but there is no guarantee of this. For tests that should allow a download, spin the runloop until
+ -_downloadDidStart: is called. The test will now timeout on failure, but will no longer produce false failures.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:
+ (downloadTest):
+
2015-09-22 Alexey Proskuryakov <a...@apple.com>
Mavericks: Media tests start to time out after a few days of bot uptime
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (190132 => 190133)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2015-09-22 21:08:40 UTC (rev 190132)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2015-09-22 21:11:35 UTC (rev 190133)
@@ -185,9 +185,12 @@
isDone = false;
downloadDidStart = false;
- TestWebKitAPI::Util::run(&isDone);
+ const bool downloadShouldStart = decision == Decision::Allow || decisionPoint > DecisionPoint::AfterResponse;
+ if (downloadShouldStart)
+ TestWebKitAPI::Util::run(&downloadDidStart);
+ else
+ TestWebKitAPI::Util::run(&isDone);
- const bool downloadShouldStart = decision == Decision::Allow || decisionPoint > DecisionPoint::AfterResponse;
EXPECT_EQ(downloadShouldStart, downloadDidStart);
[WKBrowsingContextController unregisterSchemeForCustomProtocol:[TestProtocol scheme]];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
