tests: Detach server from main loop during teardown

test_server_setup() takes a reference to the DBusServer, so we need
to release that ref by calling test_server_shutdown().
test_server_shutdown() also disconnects the server, so we don't need
to do that.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194

diff --git a/test/corrupt.c b/test/corrupt.c
index a6a912f4d5ae04763ddcacdc2d468b8153e457ee..4eaa04ff0b55d65368beae1befd5763cdce849a8 100644 (file)
--- a/test/corrupt.c
+++ b/test/corrupt.c
@@ -391,7 +391,7 @@ teardown (Fixture *f,
 
   if (f->server != NULL)
     {
-      dbus_server_disconnect (f->server);
+      test_server_shutdown (f->ctx, f->server);
       dbus_server_unref (f->server);
       f->server = NULL;
     }

diff --git a/test/fdpass.c b/test/fdpass.c
index 4a3edc4e7fb272450675a58ba5f54a2440599d38..871d9f53379704f03549e07173b86a5e599b7a0d 100644 (file)
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -859,7 +859,7 @@ teardown (Fixture *f,
 
   if (f->server != NULL)
     {
-      dbus_server_disconnect (f->server);
+      test_server_shutdown (f->ctx, f->server);
       dbus_server_unref (f->server);
       f->server = NULL;
     }

diff --git a/test/internals/refs.c b/test/internals/refs.c
index da2ef72552eaa4f5c658ca7575cc6128e8b52542..e68f6606a8dbcfe068d068ef74def5b77420e23a 100644 (file)
--- a/test/internals/refs.c
+++ b/test/internals/refs.c
@@ -424,7 +424,7 @@ test_server (Fixture *f,
 
   /* Destroy the server. This should be the last-unref. */
   g_assert (!f->last_unref);
-  dbus_server_disconnect (f->server);
+  test_server_shutdown (f->loop, f->server);
   dbus_server_unref (f->server);
   f->server = NULL;
   g_assert (f->last_unref);

diff --git a/test/loopback.c b/test/loopback.c
index 23fe4c8bf4e57a976df469b4aa0b882e54607031..fdade49465fe45b69aae3566f2bb44ad8d7443d5 100644 (file)
--- a/test/loopback.c
+++ b/test/loopback.c
@@ -429,7 +429,7 @@ teardown (Fixture *f,
   dbus_clear_connection (&f->server_conn);
 
   if (f->server != NULL)
-    dbus_server_disconnect (f->server);
+    test_server_shutdown (f->ctx, f->server);
 
   dbus_clear_server (&f->server);
   test_main_context_unref (f->ctx);

diff --git a/test/relay.c b/test/relay.c
index 2b3efb96cd69d3d2d31efc4c8c3b8340161d153b..657f5fd3b82a1570151bd34f8f9025291b4b0880 100644 (file)
--- a/test/relay.c
+++ b/test/relay.c
@@ -325,7 +325,7 @@ teardown (Fixture *f,
 
   if (f->server != NULL)
     {
-      dbus_server_disconnect (f->server);
+      test_server_shutdown (f->ctx, f->server);
       dbus_server_unref (f->server);
       f->server = NULL;
     }