tests: Call dbus_shutdown()

Not all of these tests will be fully valgrind-clean yet (or perhaps
ever), but it's easier to add this to all of them than to think
about it.

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

5 files changed, 17 insertions, 3 deletions

diff --git a/test/internals/printf.c b/test/internals/printf.c
index fb8f3552..1160b2ae 100644
--- a/test/internals/printf.c
+++ b/test/internals/printf.c
@@ -105,5 +105,6 @@ main (int argc,
    * This is how it can distinguish between an unexpected exit and
    * successful completion. */
   printf ("1..%d\n", test_num);
+  dbus_shutdown ();
   return 0;
 }
diff --git a/test/internals/refs.c b/test/internals/refs.c
index e68f6606..89f581aa 100644
--- a/test/internals/refs.c
+++ b/test/internals/refs.c
@@ -622,6 +622,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/refs/connection", Fixture, NULL, setup_connection,
@@ -633,5 +635,7 @@ main (int argc,
   g_test_add ("/refs/server", Fixture, NULL, setup,
       test_server, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }
diff --git a/test/internals/server-oom.c b/test/internals/server-oom.c
index 5d7fa4d0..605566c8 100644
--- a/test/internals/server-oom.c
+++ b/test/internals/server-oom.c
@@ -137,5 +137,6 @@ main (int argc,
   ret = g_test_run ();
 
   g_queue_free_full (test_cases_to_free, g_free);
+  dbus_shutdown ();
   return ret;
 }
diff --git a/test/internals/syslog.c b/test/internals/syslog.c
index e69c14a1..01236e96 100644
--- a/test/internals/syslog.c
+++ b/test/internals/syslog.c
@@ -102,10 +102,14 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/syslog/normal", Fixture, NULL, setup, test_syslog_normal,
               teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }
diff --git a/test/internals/variant.c b/test/internals/variant.c
index 69954e7a..e5135429 100644
--- a/test/internals/variant.c
+++ b/test/internals/variant.c
@@ -564,10 +564,14 @@ int
 main (int argc,
       char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add_func ("/variant/simple", test_simple);
   g_test_add_func ("/variant/oom", test_oom_handling);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }