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>

diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c
index ff12ff3ba7e69c4410e7e5924b527b1891c8b6b8..a52bbf5590d2fffd42d1fc51281097e30410f313 100644 (file)
--- 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);