From 97a4f3f50ff6c1ba1b2480ef04dec2e8739347e1 Mon Sep 17 00:00:00 2001 From: Kevin Ellis Date: Tue, 2 Mar 2021 19:46:27 +0000 Subject: [PATCH] Re-enable snaps-for-different-key-granularity test Bug: 986018, 1105279 Change-Id: I6031a912a02e53462bcc7e25ae92576dc821cc2e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727923 Reviewed-by: Xida Chen Commit-Queue: Kevin Ellis Cr-Commit-Position: refs/heads/master@{#859082} --- third_party/blink/web_tests/TestExpectations | 4 ---- .../snaps-for-different-key-granularity.html | 24 +++++-------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index e5aa545405a488..24199717775831 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations @@ -4454,8 +4454,6 @@ crbug.com/922951 virtual/threaded/http/tests/devtools/tracing/timeline-paint/tim # Flaky devtools test for recalculating styles. crbug.com/1018177 http/tests/devtools/tracing/timeline-style/timeline-recalculate-styles.js [ Failure Pass ] -crbug.com/986018 fast/scroll-snap/snaps-for-different-key-granularity.html [ Failure Pass ] - # Race: The RTCIceConnectionState can become "connected" before getStats() # returns candidate-pair whose state is "succeeded", this sounds like a # contradiction. @@ -5264,8 +5262,6 @@ crbug.com/1105271 [ Mac ] scrollbars/custom-scrollbar-adjust-on-inactive-pseudo. crbug.com/1105274 http/tests/devtools/tracing/timeline-js/timeline-js-line-level-profile-no-url-end-to-end.js [ Pass Timeout Failure ] crbug.com/1105275 [ Mac ] fast/dom/Window/window-onFocus.html [ Pass Failure ] -crbug.com/1105279 [ Mac ] virtual/threaded/fast/scroll-snap/snaps-for-different-key-granularity.html [ Pass Timeout Failure ] - # Temporarily disable tests to allow fixing of devtools path escaping crbug.com/1094436 http/tests/devtools/overrides/project-added-with-existing-files-bind.js [ Pass Timeout Failure ] crbug.com/1094436 http/tests/devtools/persistence/automapping-urlencoded-paths.js [ Pass Failure ] diff --git a/third_party/blink/web_tests/fast/scroll-snap/snaps-for-different-key-granularity.html b/third_party/blink/web_tests/fast/scroll-snap/snaps-for-different-key-granularity.html index e20228d8adb473..43a4d4af629931 100644 --- a/third_party/blink/web_tests/fast/scroll-snap/snaps-for-different-key-granularity.html +++ b/third_party/blink/web_tests/fast/scroll-snap/snaps-for-different-key-granularity.html @@ -75,54 +75,42 @@ promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 0); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("ArrowDown"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 200); + await waitForScrollEnd(scroller, scrollTop, 200); }, "Snaps to page1-line1 after pressing ArrowDown at page1."); promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 1200); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("ArrowUp"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 1000); + await waitForScrollEnd(scroller, scrollTop, 1000); }, "Snaps to page2-line2 after pressing ArrowUp at page3."); promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 0); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("PageDown"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 600); + await waitForScrollEnd(scroller, scrollTop, 600); }, "Snaps to page2 after pressing PageDown at page1."); promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 1200); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("PageUp"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 600); + await waitForScrollEnd(scroller, scrollTop, 600); }, "Snaps to page2 after pressing PageUp at page3."); promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 0); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("End"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 1200); + await waitForScrollEnd(scroller, scrollTop, 1200); }, "Snaps to page3 after pressing End at page1."); promise_test (async () => { await mouseClickOn(10, 10); scroller.scrollTo(0, 1200); - const scrollWatcher = waitForScrollEvent(scroller); await keyPress("Home"); - await scrollWatcher; - assert_equals(scroller.scrollTop, 0); + await waitForScrollEnd(scroller, scrollTop, 0); }, "Snaps to page1 after pressing Home at page3.");