Commit 8313306834c7f294596820919a5ed52197a574be - telepathy-glib

Tests: use g_test_dbus_unset() Also link to https://bugzilla.gnome.org/show_bug.cgi?id=697348 to explain why we still have to unset STARTER env variables. Xavier Claessens 10 years ago

1 changed file(s) with 4 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

-4

tests/lib/util.c less more

85	85
86	86	g_type_init ();
87	87
88		/* Make sure we won't be using user's bus. This unsets more than
89		* g_test_dbus_unset() currently does (glib 2.36) */
90		g_unsetenv ("DISPLAY");
	88	g_test_dbus_unset ();
	89
	90	/* GLib 2.36 does not unset STARTER env variables but tp-glib are using them.
	91	* See https://bugzilla.gnome.org/show_bug.cgi?id=697348 */
91	92	g_unsetenv ("DBUS_STARTER_ADDRESS");
92	93	g_unsetenv ("DBUS_STARTER_BUS_TYPE");
93		g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
94	94
95	95	test_dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
96	96	g_test_dbus_add_service_dir (test_dbus, g_getenv ("TP_TESTS_SERVICES_DIR"));