From e7ed232f654cbb438febd4ce978326ffdef98b0d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Sep 2013 13:54:38 -0500 Subject: Extend the death timeouts to 60 seconds --- tests/test-glib-layout-client.c | 2 +- tests/test-glib-proxy-client.c | 6 ++++-- tests/test-glib-submenu-client.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index 83b47ee..265b34f 100644 --- a/tests/test-glib-layout-client.c +++ b/tests/test-glib-layout-client.c @@ -117,7 +117,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - g_timeout_add_seconds(10, timer_func, client); + g_timeout_add_seconds(60, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 72468c8..4d11ece 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -26,6 +26,8 @@ with this program. If not, see . #include "test-glib-proxy.h" +#define DEATH_TIME 60 + static guint layouton = -2; static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; @@ -143,7 +145,7 @@ layout_verify_timer (gpointer data) } else { /* Extend our death */ g_source_remove(death_timer); - death_timer = g_timeout_add_seconds(10, timer_func, data); + death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data); } if (layouts[layouton+1].id == -1) { @@ -162,7 +164,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - death_timer = g_timeout_add_seconds(10, timer_func, client); + death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c index 29d7720..097e91d 100644 --- a/tests/test-glib-submenu-client.c +++ b/tests/test-glib-submenu-client.c @@ -100,7 +100,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - g_timeout_add_seconds(10, timer_func, client); + g_timeout_add_seconds(60, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From b20d7e1fc716b3be097740efbddb3976336a060d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Sep 2013 15:26:42 -0500 Subject: A few more --- tests/test-glib-properties-client.c | 6 ++++-- tests/test-glib-proxy-server.c | 2 +- tests/test-gtk-shortcut-client.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c index 3d6aa9d..f77eab6 100644 --- a/tests/test-glib-properties-client.c +++ b/tests/test-glib-properties-client.c @@ -26,6 +26,8 @@ with this program. If not, see . #include "test-glib-properties.h" +#define DEATH_TIME 60 + static guint layouton = 0; static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; @@ -137,7 +139,7 @@ layout_verify_timer (gpointer data) } else { /* Extend our death */ g_source_remove(death_timer); - death_timer = g_timeout_add_seconds(10, timer_func, data); + death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data); } layouton++; @@ -158,7 +160,7 @@ main (int argc, char ** argv) DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); - death_timer = g_timeout_add_seconds(10, timer_func, client); + death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c index 70ffd08..ccb4cb8 100644 --- a/tests/test-glib-proxy-server.c +++ b/tests/test-glib-proxy-server.c @@ -95,7 +95,7 @@ layout_change (DbusmenuMenuitem * oldroot, guint timestamp, gpointer data) if (death_timer != 0) { g_source_remove(death_timer); } - death_timer = g_timeout_add_seconds(10, timer_func, data); + death_timer = g_timeout_add_seconds(60, timer_func, data); return; } diff --git a/tests/test-gtk-shortcut-client.c b/tests/test-gtk-shortcut-client.c index 259e177..7147ce2 100644 --- a/tests/test-gtk-shortcut-client.c +++ b/tests/test-gtk-shortcut-client.c @@ -60,7 +60,7 @@ main (int argc, char ** argv) gtk_window_add_accel_group(GTK_WINDOW(window), agroup); gtk_widget_show(window); - death_timer = g_timeout_add_seconds(10, timer_func, window); + death_timer = g_timeout_add_seconds(60, timer_func, window); g_debug("Entering Mainloop"); mainloop = g_main_loop_new(NULL, FALSE); -- cgit v1.2.3 From d523437e665545f76d7676c68f4b5a5f069774c6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Sep 2013 16:59:58 -0500 Subject: Allowing the proxy data to stabalize a bit longer --- tests/test-glib-proxy-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 4d11ece..6421dc9 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -125,7 +125,7 @@ layout_updated (DbusmenuClient * client, gpointer data) g_source_remove(verify_timer); } - verify_timer = g_timeout_add_seconds (5, layout_verify_timer, client); + verify_timer = g_timeout_add_seconds (10, layout_verify_timer, client); return; } -- cgit v1.2.3