aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2013-09-09 22:52:49 +0000
committerTarmac <Unknown>2013-09-09 22:52:49 +0000
commit9ee26dd8ba9c0f57a114f4e3fa8f292bf37fc4d4 (patch)
tree661198273b2b134d62a4ae28517d20e3a5c13121
parent3bfb7b20c40b956c0379beaab0055cb24bde362f (diff)
parentd523437e665545f76d7676c68f4b5a5f069774c6 (diff)
downloadlibdbusmenu-9ee26dd8ba9c0f57a114f4e3fa8f292bf37fc4d4.tar.gz
libdbusmenu-9ee26dd8ba9c0f57a114f4e3fa8f292bf37fc4d4.tar.bz2
libdbusmenu-9ee26dd8ba9c0f57a114f4e3fa8f292bf37fc4d4.zip
Extend timeouts for busy Jenkins ARM machines.
Approved by PS Jenkins bot, Charles Kerr.
-rw-r--r--tests/test-glib-layout-client.c2
-rw-r--r--tests/test-glib-properties-client.c6
-rw-r--r--tests/test-glib-proxy-client.c8
-rw-r--r--tests/test-glib-proxy-server.c2
-rw-r--r--tests/test-glib-submenu-client.c2
-rw-r--r--tests/test-gtk-shortcut-client.c2
6 files changed, 13 insertions, 9 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-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 <http://www.gnu.org/licenses/>.
#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-client.c b/tests/test-glib-proxy-client.c
index 72468c8..6421dc9 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 <http://www.gnu.org/licenses/>.
#include "test-glib-proxy.h"
+#define DEATH_TIME 60
+
static guint layouton = -2;
static GMainLoop * mainloop = NULL;
static gboolean passed = TRUE;
@@ -123,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;
}
@@ -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-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-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);
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);