test: remove some untriggered code from the keyboard tests

The second condition was never triggered because we shouldn't get anything but
keyboard events here. Drain the initial event burst and remove the two
skipping conditions that won't happen anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2017-01-05 20:11:26 +10:00
parent 5dcb949c3d
commit a9016f7e15

View file

@ -50,18 +50,13 @@ START_TEST(keyboard_seat_key_count)
NULL, NULL, NULL);
}
litest_drain_events(libinput);
for (i = 0; i < num_devices; ++i)
litest_keyboard_key(devices[i], KEY_A, true);
libinput_dispatch(libinput);
while ((ev = libinput_get_event(libinput))) {
if (libinput_event_get_type(ev) !=
LIBINPUT_EVENT_KEYBOARD_KEY) {
libinput_event_destroy(ev);
libinput_dispatch(libinput);
continue;
}
kev = litest_is_keyboard_event(ev,
KEY_A,
LIBINPUT_KEY_STATE_PRESSED);
@ -82,13 +77,6 @@ START_TEST(keyboard_seat_key_count)
libinput_dispatch(libinput);
while ((ev = libinput_get_event(libinput))) {
if (libinput_event_get_type(ev) !=
LIBINPUT_EVENT_KEYBOARD_KEY) {
libinput_event_destroy(ev);
libinput_dispatch(libinput);
continue;
}
kev = libinput_event_get_keyboard_event(ev);
ck_assert_notnull(kev);
ck_assert_int_eq(libinput_event_keyboard_get_key(kev), KEY_A);