diff options
| author | satrmb <10471-satrmb_true-email-is-private_contact-via-web@gitlab.freedesktop.org> | 2021-02-12 14:35:53 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-02-15 05:46:46 +0000 |
| commit | 37e6e89ed59e6638dffaae69c0d077a563032b95 (patch) | |
| tree | 6f13ecb1f40b7c24b3e65700969792119b6dc640 | |
| parent | 4ccdacaf95a62e7895eb150aec6b93cd8c69f842 (diff) | |
| download | libinput-37e6e89ed59e6638dffaae69c0d077a563032b95.tar.gz | |
test: fix a few missing or wrong drag-lock timeouts
These had no consequences apart from occasional "system is too slow" messages,
because the test suite's shorter tap timeout is just barely long enough
for drag-lock, and/or because litest_assert_button_event waits for an event
anyway.
Signed-off-by: satrmb <10471-satrmb@users.noreply.gitlab.freedesktop.org>
| -rw-r--r-- | test/test-touchpad-tap.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c index ff12ff3b..a52bbf55 100644 --- a/test/test-touchpad-tap.c +++ b/test/test-touchpad-tap.c @@ -285,7 +285,7 @@ START_TEST(touchpad_multitap) ck_assert_int_ge(curtime, oldtime); oldtime = curtime; } - litest_timeout_tap(); + litest_timeout_tapndrag(); litest_assert_empty_queue(li); } END_TEST @@ -390,6 +390,8 @@ START_TEST(touchpad_multitap_n_drag_move) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); + libinput_dispatch(li); + litest_timeout_tapndrag(); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -506,7 +508,8 @@ START_TEST(touchpad_multitap_n_drag_2fg) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - litest_timeout_tap(); + libinput_dispatch(li); + litest_timeout_tapndrag(); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -612,7 +615,7 @@ START_TEST(touchpad_multitap_n_drag_click) BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); litest_touch_up(dev, 0); - litest_timeout_tap(); + litest_timeout_tapndrag(); litest_assert_empty_queue(li); } @@ -814,6 +817,8 @@ START_TEST(touchpad_multitap_n_drag_timeout) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); + libinput_dispatch(li); + litest_timeout_tapndrag(); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -906,6 +911,8 @@ START_TEST(touchpad_multitap_n_drag_high_delay) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); + libinput_dispatch(li); + litest_timeout_tapndrag(); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); |