Title: [245204] trunk/Tools
- Revision
- 245204
- Author
- [email protected]
- Date
- 2019-05-10 19:15:21 -0700 (Fri, 10 May 2019)
Log Message
Unreviewed, fix ProcessSwap.OpenerLinkAfterAPIControlledProcessSwappingOfOpener API test
It became flaky after r245198.
* TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (245203 => 245204)
--- trunk/Tools/ChangeLog 2019-05-11 01:40:00 UTC (rev 245203)
+++ trunk/Tools/ChangeLog 2019-05-11 02:15:21 UTC (rev 245204)
@@ -1,3 +1,11 @@
+2019-05-10 Chris Dumez <[email protected]>
+
+ Unreviewed, fix ProcessSwap.OpenerLinkAfterAPIControlledProcessSwappingOfOpener API test
+
+ It became flaky after r245198.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
+
2019-05-10 Youenn Fablet <[email protected]>
A service worker instance should be terminated when its SWServer is destroyed
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (245203 => 245204)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2019-05-11 01:40:00 UTC (rev 245203)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2019-05-11 02:15:21 UTC (rev 245204)
@@ -4574,15 +4574,23 @@
auto pid2 = [webView _webProcessIdentifier];
EXPECT_NE(pid1, pid2);
+
+ bool hasOpener = true;
+ int timeout = 50;
+ do {
+ if (timeout != 50)
+ TestWebKitAPI::Util::sleep(0.1);
+
+ // Auxiliary window's opener should no longer have an opener.
+ [createdWebView evaluateJavaScript:@"window.opener ? 'true' : 'false'" completionHandler: [&] (id hasOpenerString, NSError *error) {
+ hasOpener = [hasOpenerString isEqualToString:@"true"];
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+ done = false;
+ } while (hasOpener && (--timeout));
+ EXPECT_FALSE(hasOpener);
- // Auxiliary window's opener should no longer have an opener.
- [createdWebView evaluateJavaScript:@"window.opener ? 'true' : 'false'" completionHandler: [&] (id hasOpener, NSError *error) {
- EXPECT_WK_STREQ(@"false", hasOpener);
- done = true;
- }];
- TestWebKitAPI::Util::run(&done);
- done = false;
-
[createdWebView evaluateJavaScript:@"savedOpener.closed ? 'true' : 'false'" completionHandler: [&] (id savedOpenerIsClosed, NSError *error) {
EXPECT_WK_STREQ(@"true", savedOpenerIsClosed);
done = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
