Revert "Add GTestDBus object"

This reverts commit 1b5f70b5b0.
This commit is contained in:
David Zeuthen
2012-04-18 13:47:51 -04:00
parent 9dce93514e
commit a6f83d73e5
30 changed files with 469 additions and 838 deletions

View File

@@ -117,7 +117,11 @@ test_exit_on_close (gconstpointer test_data)
/* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE);
g_test_dbus_unset ();
/* all the tests use a session bus with a well-known address that we can bring up and down
* using session_bus_up() and session_bus_down().
*/
g_unsetenv ("DISPLAY");
g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_get_temporary_address (), TRUE);
if (g_test_verbose ())
silence = 0;
@@ -169,16 +173,12 @@ test_exit_on_close (gconstpointer test_data)
}
else
{
session_bus_stop ();
session_bus_down ();
}
g_main_loop_run (loop);
/* this is only reached when we turn off exit-on-close */
g_main_loop_unref (loop);
g_object_unref (c);
session_bus_down ();
exit (0);
}