testsuite: Drop test bus

It seems to be buggy in ways that make the test fail
with a critical when the test bus is brought down.
At the same time, drop manual settings of environment
variables that we can set globally.

1 files changed, 0 insertions, 14 deletions

diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 2a2e155b6b..002c207b64 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -656,14 +656,8 @@ main (int argc, char **argv)
   const GType *otypes;
   guint i;
   gchar *schema_dir;
-  GTestDBus *bus;
   gint result;
 
-  /* These must be set before before gtk_test_init */
-  g_setenv ("GIO_USE_VFS", "local", TRUE);
-  g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-  g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE);
-
   gtk_test_init (&argc, &argv);
   gtk_test_register_all_types();
 
@@ -671,12 +665,6 @@ main (int argc, char **argv)
   schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL);
   g_setenv ("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE);
 
-  /* Create one test bus for all tests, as we have a lot of very small
-   * and quick tests.
-   */
-  bus = g_test_dbus_new (G_TEST_DBUS_NONE);
-  g_test_dbus_up (bus);
-
   otypes = gtk_test_list_all_types (NULL);
   for (i = 0; otypes[i]; i++)
     {
@@ -689,8 +677,6 @@ main (int argc, char **argv)
 
   result = g_test_run ();
 
-  g_test_dbus_down (bus);
-  g_object_unref (bus);
   g_free (schema_dir);
 
   return result;