DBus Menu

Merge lp:~ted/libdbusmenu/arm-tests into lp:libdbusmenu/13.10

  1. arm-tests
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 459
Merged at revision: 457
Proposed branch: lp:~ted/libdbusmenu/arm-tests
Merge into: lp:libdbusmenu/13.10
Diff against target: 122 lines (+13/-9)
6 files modified
tests/test-glib-layout-client.c (+1/-1)
tests/test-glib-properties-client.c (+4/-2)
tests/test-glib-proxy-client.c (+5/-3)
tests/test-glib-proxy-server.c (+1/-1)
tests/test-glib-submenu-client.c (+1/-1)
tests/test-gtk-shortcut-client.c (+1/-1)
To merge this branch: bzr merge lp:~ted/libdbusmenu/arm-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+184658@code.launchpad.net

Commit message

Extend timeouts for busy Jenkins ARM machines

Description of the change

Let's see if this works.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libdbusmenu-autolanding/11/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-autolanding/9
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-autolanding/4/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/13/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libdbusmenu-autolanding/12/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-autolanding/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-autolanding/5/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/test-glib-layout-client.c'
--- tests/test-glib-layout-client.c 2013-01-21 16:04:47 +0000
+++ tests/test-glib-layout-client.c 2013-09-09 22:09:23 +0000
@@ -117,7 +117,7 @@
117 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");117 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
118 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);118 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
119119
120 g_timeout_add_seconds(10, timer_func, client);120 g_timeout_add_seconds(60, timer_func, client);
121121
122 mainloop = g_main_loop_new(NULL, FALSE);122 mainloop = g_main_loop_new(NULL, FALSE);
123 g_main_loop_run(mainloop);123 g_main_loop_run(mainloop);
124124
=== modified file 'tests/test-glib-properties-client.c'
--- tests/test-glib-properties-client.c 2013-01-21 16:04:47 +0000
+++ tests/test-glib-properties-client.c 2013-09-09 22:09:23 +0000
@@ -26,6 +26,8 @@
2626
27#include "test-glib-properties.h"27#include "test-glib-properties.h"
2828
29#define DEATH_TIME 60
30
29static guint layouton = 0;31static guint layouton = 0;
30static GMainLoop * mainloop = NULL;32static GMainLoop * mainloop = NULL;
31static gboolean passed = TRUE;33static gboolean passed = TRUE;
@@ -137,7 +139,7 @@
137 } else {139 } else {
138 /* Extend our death */140 /* Extend our death */
139 g_source_remove(death_timer);141 g_source_remove(death_timer);
140 death_timer = g_timeout_add_seconds(10, timer_func, data);142 death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data);
141 }143 }
142144
143 layouton++;145 layouton++;
@@ -158,7 +160,7 @@
158 DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");160 DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
159 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);161 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
160162
161 death_timer = g_timeout_add_seconds(10, timer_func, client);163 death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client);
162164
163 mainloop = g_main_loop_new(NULL, FALSE);165 mainloop = g_main_loop_new(NULL, FALSE);
164 g_main_loop_run(mainloop);166 g_main_loop_run(mainloop);
165167
=== modified file 'tests/test-glib-proxy-client.c'
--- tests/test-glib-proxy-client.c 2013-06-24 18:58:29 +0000
+++ tests/test-glib-proxy-client.c 2013-09-09 22:09:23 +0000
@@ -26,6 +26,8 @@
2626
27#include "test-glib-proxy.h"27#include "test-glib-proxy.h"
2828
29#define DEATH_TIME 60
30
29static guint layouton = -2;31static guint layouton = -2;
30static GMainLoop * mainloop = NULL;32static GMainLoop * mainloop = NULL;
31static gboolean passed = TRUE;33static gboolean passed = TRUE;
@@ -123,7 +125,7 @@
123 g_source_remove(verify_timer);125 g_source_remove(verify_timer);
124 }126 }
125127
126 verify_timer = g_timeout_add_seconds (5, layout_verify_timer, client);128 verify_timer = g_timeout_add_seconds (10, layout_verify_timer, client);
127 return;129 return;
128}130}
129131
@@ -143,7 +145,7 @@
143 } else {145 } else {
144 /* Extend our death */146 /* Extend our death */
145 g_source_remove(death_timer);147 g_source_remove(death_timer);
146 death_timer = g_timeout_add_seconds(10, timer_func, data);148 death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data);
147 }149 }
148150
149 if (layouts[layouton+1].id == -1) {151 if (layouts[layouton+1].id == -1) {
@@ -162,7 +164,7 @@
162 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");164 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
163 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);165 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
164166
165 death_timer = g_timeout_add_seconds(10, timer_func, client);167 death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client);
166168
167 mainloop = g_main_loop_new(NULL, FALSE);169 mainloop = g_main_loop_new(NULL, FALSE);
168 g_main_loop_run(mainloop);170 g_main_loop_run(mainloop);
169171
=== modified file 'tests/test-glib-proxy-server.c'
--- tests/test-glib-proxy-server.c 2013-06-24 18:57:46 +0000
+++ tests/test-glib-proxy-server.c 2013-09-09 22:09:23 +0000
@@ -95,7 +95,7 @@
95 if (death_timer != 0) {95 if (death_timer != 0) {
96 g_source_remove(death_timer);96 g_source_remove(death_timer);
97 }97 }
98 death_timer = g_timeout_add_seconds(10, timer_func, data);98 death_timer = g_timeout_add_seconds(60, timer_func, data);
9999
100 return;100 return;
101}101}
102102
=== modified file 'tests/test-glib-submenu-client.c'
--- tests/test-glib-submenu-client.c 2013-01-21 16:04:47 +0000
+++ tests/test-glib-submenu-client.c 2013-09-09 22:09:23 +0000
@@ -100,7 +100,7 @@
100 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");100 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
101 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);101 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
102102
103 g_timeout_add_seconds(10, timer_func, client);103 g_timeout_add_seconds(60, timer_func, client);
104104
105 mainloop = g_main_loop_new(NULL, FALSE);105 mainloop = g_main_loop_new(NULL, FALSE);
106 g_main_loop_run(mainloop);106 g_main_loop_run(mainloop);
107107
=== modified file 'tests/test-gtk-shortcut-client.c'
--- tests/test-gtk-shortcut-client.c 2011-06-17 18:34:02 +0000
+++ tests/test-gtk-shortcut-client.c 2013-09-09 22:09:23 +0000
@@ -60,7 +60,7 @@
60 gtk_window_add_accel_group(GTK_WINDOW(window), agroup);60 gtk_window_add_accel_group(GTK_WINDOW(window), agroup);
61 gtk_widget_show(window);61 gtk_widget_show(window);
6262
63 death_timer = g_timeout_add_seconds(10, timer_func, window);63 death_timer = g_timeout_add_seconds(60, timer_func, window);
6464
65 g_debug("Entering Mainloop");65 g_debug("Entering Mainloop");
66 mainloop = g_main_loop_new(NULL, FALSE);66 mainloop = g_main_loop_new(NULL, FALSE);

Subscribers

People subscribed via source and target branches

to all changes: