summaryrefslogtreecommitdiff
path: root/test/relay.c
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2015-04-13 15:36:21 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2015-04-13 15:41:08 +0200
commit718843d351aa06d25c393883b8e9bef63a0112ca (patch)
treee3d28cb8b58aed7363994016980b73f07a2b19ad /test/relay.c
parent4101e0bc6ca18a0f45a47de7c2a364589c55c74d (diff)
parentc225ff833028bfcfc9809dcc124d9c6a737a3eac (diff)
downloaddbus-718843d351aa06d25c393883b8e9bef63a0112ca.tar.gz
Merge branch 'dbus-1.8'
Conflicts: dbus/dbus-sysdeps-win.c
Diffstat (limited to 'test/relay.c')
-rw-r--r--test/relay.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/relay.c b/test/relay.c
index a6ccb412..0d9defff 100644
--- a/test/relay.c
+++ b/test/relay.c
@@ -273,6 +273,7 @@ teardown (Fixture *f,
{
if (f->left_client_conn != NULL)
{
+ test_connection_shutdown(NULL, f->left_client_conn);
dbus_connection_close (f->left_client_conn);
dbus_connection_unref (f->left_client_conn);
f->left_client_conn = NULL;
@@ -280,6 +281,7 @@ teardown (Fixture *f,
if (f->right_client_conn != NULL)
{
+ test_connection_shutdown(NULL, f->right_client_conn);
dbus_connection_close (f->right_client_conn);
dbus_connection_unref (f->right_client_conn);
f->right_client_conn = NULL;
@@ -287,6 +289,7 @@ teardown (Fixture *f,
if (f->left_server_conn != NULL)
{
+ test_connection_shutdown(NULL, f->left_server_conn);
dbus_connection_close (f->left_server_conn);
dbus_connection_unref (f->left_server_conn);
f->left_server_conn = NULL;
@@ -294,6 +297,7 @@ teardown (Fixture *f,
if (f->right_server_conn != NULL)
{
+ test_connection_shutdown(NULL, f->right_server_conn);
dbus_connection_close (f->right_server_conn);
dbus_connection_unref (f->right_server_conn);
f->right_server_conn = NULL;