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
1=== modified file 'tests/test-glib-layout-client.c'
2--- tests/test-glib-layout-client.c 2013-01-21 16:04:47 +0000
3+++ tests/test-glib-layout-client.c 2013-09-09 22:09:23 +0000
4@@ -117,7 +117,7 @@
5 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
6 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
7
8- g_timeout_add_seconds(10, timer_func, client);
9+ g_timeout_add_seconds(60, timer_func, client);
10
11 mainloop = g_main_loop_new(NULL, FALSE);
12 g_main_loop_run(mainloop);
13
14=== modified file 'tests/test-glib-properties-client.c'
15--- tests/test-glib-properties-client.c 2013-01-21 16:04:47 +0000
16+++ tests/test-glib-properties-client.c 2013-09-09 22:09:23 +0000
17@@ -26,6 +26,8 @@
18
19 #include "test-glib-properties.h"
20
21+#define DEATH_TIME 60
22+
23 static guint layouton = 0;
24 static GMainLoop * mainloop = NULL;
25 static gboolean passed = TRUE;
26@@ -137,7 +139,7 @@
27 } else {
28 /* Extend our death */
29 g_source_remove(death_timer);
30- death_timer = g_timeout_add_seconds(10, timer_func, data);
31+ death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data);
32 }
33
34 layouton++;
35@@ -158,7 +160,7 @@
36 DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
37 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
38
39- death_timer = g_timeout_add_seconds(10, timer_func, client);
40+ death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client);
41
42 mainloop = g_main_loop_new(NULL, FALSE);
43 g_main_loop_run(mainloop);
44
45=== modified file 'tests/test-glib-proxy-client.c'
46--- tests/test-glib-proxy-client.c 2013-06-24 18:58:29 +0000
47+++ tests/test-glib-proxy-client.c 2013-09-09 22:09:23 +0000
48@@ -26,6 +26,8 @@
49
50 #include "test-glib-proxy.h"
51
52+#define DEATH_TIME 60
53+
54 static guint layouton = -2;
55 static GMainLoop * mainloop = NULL;
56 static gboolean passed = TRUE;
57@@ -123,7 +125,7 @@
58 g_source_remove(verify_timer);
59 }
60
61- verify_timer = g_timeout_add_seconds (5, layout_verify_timer, client);
62+ verify_timer = g_timeout_add_seconds (10, layout_verify_timer, client);
63 return;
64 }
65
66@@ -143,7 +145,7 @@
67 } else {
68 /* Extend our death */
69 g_source_remove(death_timer);
70- death_timer = g_timeout_add_seconds(10, timer_func, data);
71+ death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, data);
72 }
73
74 if (layouts[layouton+1].id == -1) {
75@@ -162,7 +164,7 @@
76 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
77 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
78
79- death_timer = g_timeout_add_seconds(10, timer_func, client);
80+ death_timer = g_timeout_add_seconds(DEATH_TIME, timer_func, client);
81
82 mainloop = g_main_loop_new(NULL, FALSE);
83 g_main_loop_run(mainloop);
84
85=== modified file 'tests/test-glib-proxy-server.c'
86--- tests/test-glib-proxy-server.c 2013-06-24 18:57:46 +0000
87+++ tests/test-glib-proxy-server.c 2013-09-09 22:09:23 +0000
88@@ -95,7 +95,7 @@
89 if (death_timer != 0) {
90 g_source_remove(death_timer);
91 }
92- death_timer = g_timeout_add_seconds(10, timer_func, data);
93+ death_timer = g_timeout_add_seconds(60, timer_func, data);
94
95 return;
96 }
97
98=== modified file 'tests/test-glib-submenu-client.c'
99--- tests/test-glib-submenu-client.c 2013-01-21 16:04:47 +0000
100+++ tests/test-glib-submenu-client.c 2013-09-09 22:09:23 +0000
101@@ -100,7 +100,7 @@
102 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
103 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
104
105- g_timeout_add_seconds(10, timer_func, client);
106+ g_timeout_add_seconds(60, timer_func, client);
107
108 mainloop = g_main_loop_new(NULL, FALSE);
109 g_main_loop_run(mainloop);
110
111=== modified file 'tests/test-gtk-shortcut-client.c'
112--- tests/test-gtk-shortcut-client.c 2011-06-17 18:34:02 +0000
113+++ tests/test-gtk-shortcut-client.c 2013-09-09 22:09:23 +0000
114@@ -60,7 +60,7 @@
115 gtk_window_add_accel_group(GTK_WINDOW(window), agroup);
116 gtk_widget_show(window);
117
118- death_timer = g_timeout_add_seconds(10, timer_func, window);
119+ death_timer = g_timeout_add_seconds(60, timer_func, window);
120
121 g_debug("Entering Mainloop");
122 mainloop = g_main_loop_new(NULL, FALSE);

Subscribers

People subscribed via source and target branches

to all changes: