Title: [259569] trunk/Tools
Revision
259569
Author
grao...@webkit.org
Date
2020-04-06 08:16:39 -0700 (Mon, 06 Apr 2020)

Log Message

[macOS] TestWebKitAPI.WKUserContentController.UserStyleSheetAffectingOnlySpecificWebViewSharedConfiguration is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=209934
<rdar://problem/61229832>

Reviewed by Antti Koivisto.

Fix a couple of tests which would use `-[WKWebView _test_waitForDidFinishNavigation]` in a way where the navigation may have finished before the method was called.

* TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm:
(TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (259568 => 259569)


--- trunk/Tools/ChangeLog	2020-04-06 09:57:27 UTC (rev 259568)
+++ trunk/Tools/ChangeLog	2020-04-06 15:16:39 UTC (rev 259569)
@@ -1,3 +1,16 @@
+2020-04-06  Antoine Quint  <grao...@apple.com>
+
+        [macOS] TestWebKitAPI.WKUserContentController.UserStyleSheetAffectingOnlySpecificWebViewSharedConfiguration is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=209934
+        <rdar://problem/61229832>
+
+        Reviewed by Antti Koivisto.
+
+        Fix a couple of tests which would use `-[WKWebView _test_waitForDidFinishNavigation]` in a way where the navigation may have finished before the method was called.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm:
+        (TEST):
+
 2020-04-05  Gus Caplan  <m...@gus.host> and Ross Kirsling  <ross.kirsl...@sony.com>
 
         DLLLauncherMain print to console instead of opening window on fatal error

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm (259568 => 259569)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm	2020-04-06 09:57:27 UTC (rev 259568)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm	2020-04-06 15:16:39 UTC (rev 259569)
@@ -513,9 +513,9 @@
     RetainPtr<WKWebView> otherWebView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
     [targetWebView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
+    [targetWebView _test_waitForDidFinishNavigation];
+
     [otherWebView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
-
-    [targetWebView _test_waitForDidFinishNavigation];
     [otherWebView _test_waitForDidFinishNavigation];
 
     expectScriptEvaluatesToColor(targetWebView.get(), backgroundColorScript, redInRGB);
@@ -566,9 +566,9 @@
     RetainPtr<WKWebView> otherWebView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
 
     [targetWebView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
+    [targetWebView _test_waitForDidFinishNavigation];
+
     [otherWebView loadHTMLString:@"<body style='background-color: red;'></body>" baseURL:nil];
-
-    [targetWebView _test_waitForDidFinishNavigation];
     [otherWebView _test_waitForDidFinishNavigation];
 
     expectScriptEvaluatesToColor(targetWebView.get(), backgroundColorScript, redInRGB);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to