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

[Antti Kaijanmäki]

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

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

[PS Jenkins bot (ps-jenkins)]

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]

316. By Antti Kaijanmäki on 2013-08-22

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

[PS Jenkins bot (ps-jenkins)]

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)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'tests/test-watchdog.c'
--- tests/test-watchdog.c	2013-04-26 16:22:01 +0000
+++ tests/test-watchdog.c	2013-08-22 12:12:46 +0000
@@ -76,10 +76,10 @@
 }
 
 static gboolean
-hit_one_sec (gpointer pboolean)
+hit_two_sec (gpointer pboolean)
 {
-	gboolean * onesec = (gboolean *)pboolean;
-	*onesec = TRUE;
+	gboolean * twosec = (gboolean *)pboolean;
+	*twosec = TRUE;
 	return FALSE;
 }
 
@@ -102,17 +102,18 @@
 	g_clear_object(&doggie);
 
 	/* Test a single ping */
-	gboolean one_sec_hit = FALSE;
+	g_setenv("HUD_SERVICE_TIMEOUT", "3", TRUE);	
+	gboolean two_sec_hit = FALSE;
 	doggie = hud_watchdog_new(loop);
 
-	final = g_timeout_add_seconds(3, final_fail, loop);
-	g_timeout_add(500, ping_watchdog, doggie);
-	g_timeout_add(1000, hit_one_sec, &one_sec_hit);
+	final = g_timeout_add_seconds(15, final_fail, loop);
+	g_timeout_add(1000, ping_watchdog, doggie);
+	g_timeout_add(2000, hit_two_sec, &two_sec_hit);
 
 	g_main_loop_run(loop);
 	g_source_remove(final);
 
-	g_assert(one_sec_hit);
+	g_assert(two_sec_hit);
 	g_clear_object(&doggie);