Commit cbbbd581 authored by Liviu Tinta's avatar Liviu Tinta Committed by Commit Bot

Fix flaky wpt pointerevent_mouse-pointer-preventdefault

I've observed some flakiness related to timeouts. Remove timeout
promise in call to EventWatcher.
Move around actual/expected in assert_array_equals.

Bug: 1085549, 1085647
Change-Id: Icb18a6f7812557b77dfc4b5ae6b7af84b6dc478c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388880Reviewed-by: default avatarLan Wei <lanwei@chromium.org>
Commit-Queue: Liviu Tinta <liviutinta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803841}
parent 92c3b42d
...@@ -153,8 +153,8 @@ async function runTestForDefaultEvent(preventDefaultEvent) { ...@@ -153,8 +153,8 @@ async function runTestForDefaultEvent(preventDefaultEvent) {
if(eventToPreventDefault === 'none'){ if(eventToPreventDefault === 'none'){
assert_true(arePointerEventsBeforeCompatMouseEvents(receivedEvents), "There are no compatible mouse events for all pointer events:" + receivedEvents); assert_true(arePointerEventsBeforeCompatMouseEvents(receivedEvents), "There are no compatible mouse events for all pointer events:" + receivedEvents);
} }
assert_array_equals(expectedPointerEvents.get(preventDefaultEvent), receivedPointerEvents); assert_array_equals(receivedPointerEvents, expectedPointerEvents.get(preventDefaultEvent));
assert_array_equals(expectedMouseEvents.get(preventDefaultEvent), receivedMouseEvents); assert_array_equals(receivedMouseEvents, expectedMouseEvents.get(preventDefaultEvent));
}); });
resolve(); resolve();
}), `Verifies the effect of pointer event prevent-default on ${preventDefaultEvent}`); }), `Verifies the effect of pointer event prevent-default on ${preventDefaultEvent}`);
...@@ -174,7 +174,7 @@ function performActions(test, preventDefaultEvent){ ...@@ -174,7 +174,7 @@ function performActions(test, preventDefaultEvent){
let x2 = Math.ceil(rect.left + 3); let x2 = Math.ceil(rect.left + 3);
let y2 = Math.ceil(rect.top + 5); let y2 = Math.ceil(rect.top + 5);
let eventWatcher = new EventWatcher(test, targetDiv, ["mouseleave"], ()=>waitForAnimationFrames(900)); let eventWatcher = new EventWatcher(test, targetDiv, ["mouseleave"]);
// wait for all expected events to happen. // wait for all expected events to happen.
// Because each test ends with mouseleave and there are 2 mouseleave events, // Because each test ends with mouseleave and there are 2 mouseleave events,
// we use EventWatcher to wait for the two mouseleave events to happen // we use EventWatcher to wait for the two mouseleave events to happen
...@@ -191,7 +191,7 @@ function performActions(test, preventDefaultEvent){ ...@@ -191,7 +191,7 @@ function performActions(test, preventDefaultEvent){
.pointerDown() .pointerDown()
.pointerMove(x2+5, y2+5) .pointerMove(x2+5, y2+5)
.pointerMove(x1, y1) .pointerMove(x1, y1)
.pointerMove(x2, y2) .pointerMove(x2+1, y2+1)
.pointerUp() .pointerUp()
// move outside target again // move outside target again
.pointerMove(x1, y1) .pointerMove(x1, y1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment