From: Simon McVittie <smcv@collabora.com>
Date: Wed, 11 Jul 2018 15:22:49 +0000 (+0100)
Subject: tests: Detach server from main loop during teardown
X-Git-Tag: dbus-1.13.6~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c36fc0aa59a580dedf27c24e7df282ca3276450;p=thirdparty%2Fdbus.git

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 a6a912f4d..4eaa04ff0 100644
--- 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 4a3edc4e7..871d9f533 100644
--- 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 da2ef7255..e68f6606a 100644
--- 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 23fe4c8bf..fdade4946 100644
--- 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 2b3efb96c..657f5fd3b 100644
--- 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;
     }