luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add GTestDBus object"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
gio/tests/gdbus-export.c
View File

@@ -1341,7 +1341,7 @@ test_object_registration (void)
/* To prevent from exiting and attaching a D-Bus tool like D-Feet; uncomment: */
#if 0
g_debug ("Point D-feet or other tool at: %s", g_test_dbus_get_temporary_address());
g_debug ("Point D-feet or other tool at: %s", session_bus_get_temporary_address());
g_main_loop_run (loop);
#endif
@@ -1537,8 +1537,19 @@ main (int argc,
/* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE);
/* 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);
session_bus_up ();
/* TODO: wait a bit for the bus to come up.. ideally session_bus_up() won't return
* until one can connect to the bus but that's not how things work right now
*/
usleep (500 * 1000);
g_test_add_func ("/gdbus/object-registration", test_object_registration);
g_test_add_func ("/gdbus/registered-interfaces", test_registered_interfaces);