[mutter/gnome-3-34] tests/monitor-unit-tests: Move test client sanity check into helper



commit c9a05d4581381c1af56a950f20f73c31441e2ba2
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Fri Nov 1 13:35:38 2019 +0100

    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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]