Unity HUD

Merge lp:~indicator-applet-developers/hud/g_action_map_lookup_action into lp:hud/13.10

  1. g_action_map_lookup_action
  2. Merge into trunk.13.10
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Pete Woods
Approved revision: 316
Merged at revision: 315
Proposed branch: lp:~indicator-applet-developers/hud/g_action_map_lookup_action
Merge into: lp:hud/13.10
Diff against target: 39 lines (+9/-8)
1 file modified
tests/test-watchdog.c (+9/-8)
To merge this branch: bzr merge lp:~indicator-applet-developers/hud/g_action_map_lookup_action
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+181533@code.launchpad.net

Commit message

Adjust watchdog test limits to get rid of random timing failures.

Description of the change

adjust watchdog test limits to get rid of random timing failures.

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

FAILED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/hud-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/76
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/76

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/115/rebuild

review: Needs Fixing (continuous-integration)
lp:~indicator-applet-developers/hud/g_action_map_lookup_action updated
316. By Antti Kaijanmäki

test-watchdog: increase the final_fail timeout to 15s.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:316
http://jenkins.qa.ubuntu.com/job/hud-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/116/rebuild

review: Approve (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test-watchdog.c'
2--- tests/test-watchdog.c 2013-04-26 16:22:01 +0000
3+++ tests/test-watchdog.c 2013-08-22 12:12:46 +0000
4@@ -76,10 +76,10 @@
5 }
6
7 static gboolean
8-hit_one_sec (gpointer pboolean)
9+hit_two_sec (gpointer pboolean)
10 {
11- gboolean * onesec = (gboolean *)pboolean;
12- *onesec = TRUE;
13+ gboolean * twosec = (gboolean *)pboolean;
14+ *twosec = TRUE;
15 return FALSE;
16 }
17
18@@ -102,17 +102,18 @@
19 g_clear_object(&doggie);
20
21 /* Test a single ping */
22- gboolean one_sec_hit = FALSE;
23+ g_setenv("HUD_SERVICE_TIMEOUT", "3", TRUE);
24+ gboolean two_sec_hit = FALSE;
25 doggie = hud_watchdog_new(loop);
26
27- final = g_timeout_add_seconds(3, final_fail, loop);
28- g_timeout_add(500, ping_watchdog, doggie);
29- g_timeout_add(1000, hit_one_sec, &one_sec_hit);
30+ final = g_timeout_add_seconds(15, final_fail, loop);
31+ g_timeout_add(1000, ping_watchdog, doggie);
32+ g_timeout_add(2000, hit_two_sec, &two_sec_hit);
33
34 g_main_loop_run(loop);
35 g_source_remove(final);
36
37- g_assert(one_sec_hit);
38+ g_assert(two_sec_hit);
39 g_clear_object(&doggie);
40
41

Subscribers

People subscribed via source and target branches

to all changes: