Changeset 283395 in webkit

Timestamp:

Oct 1, 2021, 1:32:43 PM (5 years ago)

Author:

Simon Fraser

Message:

Fix flaky test: fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html
​https://bugs.webkit.org/show_bug.cgi?id=231093

Reviewed by Alan Bujtas.

This test dumped overlay scrollbar state, but that state is timing-dependent since
AppKit changes it via animations. Rather than printing the full state, just
print the expanded and enabled states, since those are the states necessary for
the test to pass.

• fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered-expected.txt:
• fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered-expected.txt (modified) (1 diff)
• fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix flaky test: fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html
+        https://bugs.webkit.org/show_bug.cgi?id=231093
+
+        Reviewed by Alan Bujtas.
+
+        This test dumped overlay scrollbar state, but that state is timing-dependent since
+        AppKit changes it via animations. Rather than printing the full state, just
+        print the expanded and enabled states, since those are the states necessary for
+        the test to pass.
+
+        * fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered-expected.txt:
+        * fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html:
+
 2021-10-01  Ayumi Kojima  <ayumi_kojima@apple.com>
 

trunk/LayoutTests/fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered-expected.txt

@@ -7 +7 @@
 enabled
 Hovering vertical scrollbar should show expanded scrollbar
-PASS Scrollbar state: enabled,expanded,visible_track,visible_thumb
+PASS Scrollbar is enabled and expanded
 Unhovering vertical scrollbar should hide it
 PASS Thumb and track hidden

trunk/LayoutTests/fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html

@@ -47 +47 @@
             await UIHelper.waitForCondition(() => {
                 let state = internals.verticalScrollbarState(scroller);
+                let enabled = state.indexOf('enabled') != -1;
                 let expanded = state.indexOf('expanded') != -1;
-                if (expanded)
-                    testPassed('Scrollbar state: ' + state);
+                if (enabled && expanded)
+                    testPassed('Scrollbar is enabled and expanded');
                 return expanded;
             });