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

[Robert Ancell]

Fix up test runner timeout logic

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/src/test-runner.c'
--- tests/src/test-runner.c	2014-02-26 03:52:39 +0000
+++ tests/src/test-runner.c	2014-02-26 23:46:22 +0000
@@ -831,7 +831,8 @@
     line->done = TRUE;
 
     /* Restart timeout */
-    g_source_remove (status_timeout);
+    if (status_timeout)
+        g_source_remove (status_timeout);
     status_timeout = g_timeout_add (status_timeout_ms, status_timeout_cb, NULL);
 
     run_commands ();
@@ -1916,7 +1917,6 @@
 ready (void)
 {
     run_commands ();
-    status_timeout = g_timeout_add (status_timeout_ms, status_timeout_cb, NULL);
 }
 
 static gboolean