fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-31 19:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: rewrite the udev seat change test

Browse source 
The previous test was prone to a race condition if multiple tests were
run in parallel: since we're using a udev context here we would see any
device added through uinput. If the DEVICE_ADDED event was from a
device added by some other test we would later fail the test because
that other device still used the default seat.

Rewrite it to use a name comparison and in the process start using the
cleanup macros.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1184>
This commit is contained in:
Peter Hutterer 2025-04-16 16:59:46 +10:00
parent 2487273b5e
commit b2c42b60da
1 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
test/test-udev.c
View file

@ -186,12 +186,7 @@ END_TEST
START_TEST(udev_change_seat)
{
struct libinput_event *event;
struct libinput_device *device;
struct libinput_seat *seat1, *seat2;
const char *seat1_name;
const char *seat2_name = "new seat";
int rc;
_unref_(udev) *udev = udev_new();
litest_assert_notnull(udev);
@ -204,50 +199,64 @@ START_TEST(udev_change_seat)
/* Drop any events from other devices */
litest_drain_events(li);
const char *devname = "udev-change-seat device";
/* Now create our own device, it should be in the "default"
* logical seat. This test may fail if there is a local rule changing
* that, but it'll be fine for the 99% case. */
_unused_ _destroy_(litest_device) *dev = litest_create(LITEST_MOUSE, NULL, NULL, NULL, NULL);
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED);
event = libinput_get_event(li);
device = libinput_event_get_device(event);
libinput_device_ref(device);
_unused_ _destroy_(litest_device) *dev = litest_create(LITEST_MOUSE,
devname,
NULL, NULL, NULL);
seat1 = libinput_device_get_seat(device);
libinput_seat_ref(seat1);
seat1_name = libinput_seat_get_logical_name(seat1);
libinput_event_destroy(event);
_unref_(libinput_device) *device = NULL;
_autofree_ char *seat1_name = NULL;
while (true) {
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED);
_destroy_(libinput_event) *event = libinput_get_event(li);
struct libinput_device *d = libinput_event_get_device(event);
const char *name = libinput_device_get_name(d);
if (strendswith(name, devname)) {
device = libinput_device_ref(d);
struct libinput_seat *seat = libinput_device_get_seat(device);
seat1_name = safe_strdup(libinput_seat_get_logical_name(seat));
break;
}
}
litest_drain_events(li);
/* Changing the logical seat name will remove and re-add the device */
rc = libinput_device_set_seat_logical_name(device,
seat2_name);
int rc = libinput_device_set_seat_logical_name(device,
seat2_name);
litest_assert_int_eq(rc, 0);
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_REMOVED);
event = libinput_get_event(li);
litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_REMOVED);
litest_assert_ptr_eq(libinput_event_get_device(event), device);
libinput_event_destroy(event);
while (true) {
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_REMOVED);
_destroy_(libinput_event) *event = libinput_get_event(li);
litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_REMOVED);
if (libinput_event_get_device(event) == device)
break;
}
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED);
event = libinput_get_event(li);
litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_ADDED);
litest_assert_ptr_ne(libinput_event_get_device(event), device);
libinput_device_unref(device);
_unref_(libinput_seat) *seat2 = NULL;
while (true) {
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED);
device = libinput_event_get_device(event);
seat2 = libinput_device_get_seat(device);
_destroy_(libinput_event) *event = libinput_get_event(li);
litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_ADDED);
struct libinput_device *d = libinput_event_get_device(event);
const char *name = libinput_device_get_name(d);
if (strendswith(name, devname)) {
seat2 = libinput_device_get_seat(d);
libinput_seat_ref(seat2);
break;
}
}
litest_assert_str_ne(libinput_seat_get_logical_name(seat2),
seat1_name);
seat1_name);
litest_assert_str_eq(libinput_seat_get_logical_name(seat2),
seat2_name);
libinput_event_destroy(event);
libinput_seat_unref(seat1);
seat2_name);
}
END_TEST