fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-27 18:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Detach server from main loop during teardown

Browse source 
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
This commit is contained in:
Simon McVittie 2018-07-11 16:22:49 +01:00
parent b14a4517a8
commit 1c36fc0aa5
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/corrupt.c
View file

@ -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;
}

2
test/fdpass.c
View file

@ -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;
}

2
test/internals/refs.c
View file

@ -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);

2
test/loopback.c
View file

@ -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);

2
test/relay.c
View file

@ -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;
}