From f5d19f3cb6c15b1731b9666b061f1ee7b5f51bd5 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 11 Jul 2018 16:22:49 +0100 Subject: [PATCH 5/7] 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 --- test/corrupt.c | 2 +- test/fdpass.c | 2 +- test/internals/refs.c | 2 +- test/loopback.c | 2 +- test/relay.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/corrupt.c b/test/corrupt.c index a6a912f4..4eaa04ff 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 4a3edc4e..871d9f53 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 da2ef725..e68f6606 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 23fe4c8b..fdade494 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 2b3efb96..657f5fd3 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; } -- 2.18.0