Changeset 286547 in webkit

Timestamp:

Dec 6, 2021, 10:27:41 AM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS] AppHighlights.AppHighlightCreateAndRestoreAndScroll is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=233828

Reviewed by Tim Horton.

This test began to sometimes fail on iOS 15 API test runners in EWS after enabling APP_HIGHLIGHTS in non-
internal builds. Make this test more robust by waiting for scrolling to the restored highlight.

• TestWebKitAPI/Tests/WebKitCocoa/WKAppHighlights.mm:

(TestWebKitAPI::TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WKAppHighlights.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] AppHighlights.AppHighlightCreateAndRestoreAndScroll is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=233828
+
+        Reviewed by Tim Horton.
+
+        This test began to sometimes fail on iOS 15 API test runners in EWS after enabling `APP_HIGHLIGHTS` in non-
+        internal builds. Make this test more robust by waiting for scrolling to the restored highlight.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKAppHighlights.mm:
+        (TestWebKitAPI::TEST):
+
 2021-12-06  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAppHighlights.mm

@@ -109 +109 @@
 
     TestWebKitAPI::Util::waitForConditionWithLogging([&] () -> bool {
-        return [webViewRestore stringByEvaluatingJavaScript:@"internals.numberOfAppHighlights()"].intValue == 1;
-    }, 2, @"Expected Highlights to be populated.");
-    EXPECT_NE(0, [[webViewRestore objectByEvaluatingJavaScript:@"pageYOffset"] floatValue]);
+        return [webViewRestore stringByEvaluatingJavaScript:@"internals.numberOfAppHighlights()"].intValue == 1
+            && [[webViewRestore objectByEvaluatingJavaScript:@"pageYOffset"] floatValue] > 0;
+    }, 2, @"Expected Highlights to be populated and the page to scroll.");
 }