* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
}
static void
+test_connection_bus_failure (void)
+{
+ GDBusConnection *c;
+ GError *error = NULL;
+
+ /*
+ * Check for correct behavior when no bus is present
+ *
+ */
+ c = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+ g_assert (error != NULL);
+ g_assert (!g_dbus_error_is_remote_error (error));
+ g_assert (c == NULL);
+ g_error_free (error);
+}
+
+static void
test_connection_life_cycle (void)
{
gboolean ret;
error = NULL;
/*
- * Check for correct behavior when no bus is present
- *
- */
- c = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- g_assert (error != NULL);
- g_assert (!g_dbus_error_is_remote_error (error));
- g_assert (c == NULL);
- g_error_free (error);
-
- /*
* Check for correct behavior when a bus is present
*/
session_bus_up ();
g_assert_cmpint (data.num_handled, ==, 4);
g_assert_cmpint (data.num_outgoing, ==, 4);
- /* this is safe; testserver will exit once the bus goes away */
- g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
-
/* wait for service to be available */
signal_handler_id = g_dbus_connection_signal_subscribe (c,
"org.freedesktop.DBus", /* sender */
NULL,
NULL);
g_assert_cmpint (signal_handler_id, !=, 0);
+
+ /* this is safe; testserver will exit once the bus goes away */
+ g_assert (g_spawn_command_line_async (g_test_get_filename (G_TEST_BUILT, "gdbus-testserver", NULL), NULL));
+
timeout_mainloop_id = g_timeout_add (30000, test_connection_filter_on_timeout, NULL);
g_main_loop_run (loop);
g_source_remove (timeout_mainloop_id);
g_test_dbus_unset ();
+ /* gdbus cleanup is pretty racy due to worker threads, so always do this test first */
+ g_test_add_func ("/gdbus/connection/bus-failure", test_connection_bus_failure);
+
g_test_add_func ("/gdbus/connection/basic", test_connection_basic);
g_test_add_func ("/gdbus/connection/life-cycle", test_connection_life_cycle);
g_test_add_func ("/gdbus/connection/send", test_connection_send);