Light Display Manager

Merge lp:~robert-ancell/lightdm/test-runner-timer-logic into lp:lightdm

  1. test-runner-timer-logic
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1906
Merged at revision: 1906
Proposed branch: lp:~robert-ancell/lightdm/test-runner-timer-logic
Merge into: lp:lightdm
Diff against target: 21 lines (+2/-2)
1 file modified
tests/src/test-runner.c (+2/-2)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/test-runner-timer-logic
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+208501@code.launchpad.net

Commit message

Fix up test runner timeout logic

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
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/src/test-runner.c'
2--- tests/src/test-runner.c 2014-02-26 03:52:39 +0000
3+++ tests/src/test-runner.c 2014-02-26 23:46:22 +0000
4@@ -831,7 +831,8 @@
5 line->done = TRUE;
6
7 /* Restart timeout */
8- g_source_remove (status_timeout);
9+ if (status_timeout)
10+ g_source_remove (status_timeout);
11 status_timeout = g_timeout_add (status_timeout_ms, status_timeout_cb, NULL);
12
13 run_commands ();
14@@ -1916,7 +1917,6 @@
15 ready (void)
16 {
17 run_commands ();
18- status_timeout = g_timeout_add (status_timeout_ms, status_timeout_cb, NULL);
19 }
20
21 static gboolean

Subscribers

People subscribed via source and target branches