From 616555a9509f3b1f313ea3056e30c48737eeb908 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 10 Jan 2013 17:18:55 -0500 Subject: some packaging fixes to make tests more resistant to timing issues and warnings from sub-libraries --- tests/test-libappindicator-fallback-watcher.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/test-libappindicator-fallback-watcher.c') diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 5494082..f337150 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -77,6 +77,7 @@ main (int argv, char ** argc) while (!has_owner && owner_count < 10000) { org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL); owner_count++; + g_usleep(500000); } if (owner_count == 10000) { @@ -104,7 +105,7 @@ main (int argv, char ** argc) /* This is the final kill function. It really shouldn't happen unless we get an error. */ - g_timeout_add(2000, kill_func, NULL); + g_timeout_add_seconds(20, kill_func, NULL); g_debug("Entering Mainloop"); -- cgit v1.2.3 From 6a86412258be37bb971c41b8f0ebd0a19a1463d2 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 16 Jan 2013 14:53:52 -0500 Subject: Remove deprecated calls to g_type_init() --- tests/test-libappindicator-dbus-client.c | 2 -- tests/test-libappindicator-fallback-watcher.c | 2 -- tests/test-libappindicator-status-client.c | 2 -- tests/test-simple-app.c | 2 -- 4 files changed, 8 deletions(-) (limited to 'tests/test-libappindicator-fallback-watcher.c') diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c index 9a51792..18c6946 100644 --- a/tests/test-libappindicator-dbus-client.c +++ b/tests/test-libappindicator-dbus-client.c @@ -204,8 +204,6 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat gint main (gint argc, gchar * argv[]) { - g_type_init(); - GError * error = NULL; DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) { diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index f337150..2648902 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -58,8 +58,6 @@ kill_func (gpointer userdata) int main (int argv, char ** argc) { - g_type_init(); - g_debug("Waiting to init."); diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 811882b..50e9c08 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -109,8 +109,6 @@ kill_func (gpointer userdata) gint main (gint argc, gchar * argv[]) { - g_type_init(); - GError * error = NULL; DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) { diff --git a/tests/test-simple-app.c b/tests/test-simple-app.c index d60d9b9..843466d 100644 --- a/tests/test-simple-app.c +++ b/tests/test-simple-app.c @@ -31,8 +31,6 @@ static GMainLoop * mainloop = NULL; int main (int argc, char ** argv) { - g_type_init(); - DbusmenuServer * dms = dbusmenu_server_new("/menu"); DbusmenuMenuitem * dmi = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(dmi, "label", "Bob"); -- cgit v1.2.3