From db91439bb05529334317d5c493183ec4093e9792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 1 Nov 2019 13:35:38 +0100 Subject: [PATCH] tests/monitor-unit-tests: Move test client sanity check into helper https://gitlab.gnome.org/GNOME/mutter/merge_requests/912 --- src/tests/monitor-unit-tests.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c index 83102c3a5..250bcd67d 100644 --- a/src/tests/monitor-unit-tests.c +++ b/src/tests/monitor-unit-tests.c @@ -378,15 +378,22 @@ create_monitor_test_clients (void) } static void -check_monitor_test_clients_state (void) +check_test_client_state (TestClient *test_client) { GError *error = NULL; - if (!test_client_wait (wayland_monitor_test_client, &error)) - g_error ("Failed to sync Wayland test client: %s", error->message); + if (!test_client_wait (test_client, &error)) + { + g_error ("Failed to sync test client '%s': %s", + test_client_get_id (test_client), error->message); + } +} - if (!test_client_wait (x11_monitor_test_client, &error)) - g_error ("Failed to sync X11 test client: %s", error->message); +static void +check_monitor_test_clients_state (void) +{ + check_test_client_state (wayland_monitor_test_client); + check_test_client_state (x11_monitor_test_client); } static void