Changeset 251931 in webkit

Timestamp:

Nov 1, 2019 11:27:00 AM (4 years ago)

Author:

Wenson Hsieh

Message:

TestWebKitAPI.EditorStateTests.TypingAttributesTextAlignmentStartEnd is flaky in iOS simulator
​https://bugs.webkit.org/show_bug.cgi?id=203733
<rdar://problem/56814640>

Reviewed by Tim Horton.

Try to fix the flaky test by making EditingTestHarness more robust. Instead of checking for expected editor
state entries after the next presentation update, wait for the latest editor state entry to contain the expected
values.

• TestWebKitAPI/EditingTestHarness.mm:

(-[EditingTestHarness _execCommand:argument:expectEntries:]):

Preserve the existing log statement by printing it out once after a few seconds, if the entry is still not found
in the last known editor state.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/EditingTestHarness.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-01  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        TestWebKitAPI.EditorStateTests.TypingAttributesTextAlignmentStartEnd is flaky in iOS simulator
+        https://bugs.webkit.org/show_bug.cgi?id=203733
+        <rdar://problem/56814640>
+
+        Reviewed by Tim Horton.
+
+        Try to fix the flaky test by making EditingTestHarness more robust. Instead of checking for expected editor
+        state entries after the next presentation update, wait for the latest editor state entry to contain the expected
+        values.
+
+        * TestWebKitAPI/EditingTestHarness.mm:
+        (-[EditingTestHarness _execCommand:argument:expectEntries:]):
+
+        Preserve the existing log statement by printing it out once after a few seconds, if the entry is still not found
+        in the last known editor state.
+
 2019-11-01  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestWebKitAPI/EditingTestHarness.mm

@@ -191 +191 @@
     TestWebKitAPI::Util::run(&done);
 
-    [_webView waitForNextPresentationUpdate];
-
     EXPECT_TRUE(result);
     if (!result)
         NSLog(@"Failed to execute editing command: ('%@', '%@')", command, argument ?: @"");
 
-    BOOL containsEntries = [self latestEditorStateContains:entries];
-    EXPECT_TRUE(containsEntries);
-    if (!containsEntries)
-        NSLog(@"Expected %@ to contain %@", self.latestEditorState, entries);
+    const NSTimeInterval loggingTimeout = 3;
+    auto startTime = retainPtr([NSDate date]);
+    BOOL hasLoggedWarning = NO;
+    BOOL containsEntries;
+    do {
+        [_webView waitForNextPresentationUpdate];
+        containsEntries = [self latestEditorStateContains:entries];
+        if (!hasLoggedWarning && [[NSDate date] timeIntervalSinceDate:startTime.get()] > loggingTimeout) {
+            NSLog(@"Expected %@ to contain %@", self.latestEditorState, entries);
+            hasLoggedWarning = YES;
+        }
+    } while (!containsEntries);
 }