Merge lp:~robert-ancell/lightdm/sys-comp-timeout into lp:~mir-team/lightdm/unity

[Robert Ancell]

Use VT switching if system compositor times out

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1615
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-raring-amd64-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/15/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-05-31 04:31:49 +0000
+++ src/seat-unity.c	2013-06-18 03:22:25 +0000
@@ -282,11 +282,10 @@
 static gboolean
 compositor_timeout_cb (gpointer data)
 {
-    Seat *seat = data;
-
-    g_debug ("Compositor failed to start");
-
-    seat_stop (seat);
+    SeatUnity *seat = data;
+
+    /* Stop the compositor - it is not working */
+    process_stop (seat->priv->compositor_process);
 
     return TRUE;
 }
@@ -296,6 +295,7 @@
 {
     gchar *command, *absolute_command, *dir;
     gboolean result;
+    int timeout;
 
     /* Replace Plymouth if it is running */
     if (plymouth_get_is_active () && plymouth_has_active_vt ())
@@ -363,8 +363,11 @@
         return FALSE;
 
     /* Connect to the compositor */
-    g_debug ("Waiting for system compositor");
-    SEAT_UNITY (seat)->priv->compositor_timeout = g_timeout_add (5000, compositor_timeout_cb, seat);
+    timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
+    if (timeout <= 0)
+        timeout = 5;
+    g_debug ("Waiting for system compositor for %ds", timeout);
+    SEAT_UNITY (seat)->priv->compositor_timeout = g_timeout_add (timeout * 1000, compositor_timeout_cb, seat);
 
     return TRUE;
 }

=== modified file 'tests/scripts/unity-compositor-fail-ready.conf'
--- tests/scripts/unity-compositor-fail-ready.conf	2013-05-20 05:20:45 +0000
+++ tests/scripts/unity-compositor-fail-ready.conf	2013-06-18 03:22:25 +0000
@@ -1,21 +1,35 @@
 #
-# Check quits when the compositor fails to indicate it is ready
+# Check falls back to VT switching when the compositor fails to indicate it is ready
 #
 
-# Increase timeout as LightDM waits a long time for the system compositor to start
-[test-runner-config]
-timeout=10
-
 [SeatDefaults]
 type=unity
+unity-compositor-timeout=1
 
 #?RUNNER DAEMON-START
 
 # System compositor starts but doesn't indicate it is ready
 #?UNITY-SYSTEM-COMPOSITOR START
 
+# Timeout and compositor is stopped
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+
+# X server starts in VT mode
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
 # Cleanup
-#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
-
-# Daemon stops with error
-#?RUNNER DAEMON-EXIT STATUS=1
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

=== modified file 'tests/scripts/unity-compositor-fail-start.conf'
--- tests/scripts/unity-compositor-fail-start.conf	2013-05-31 02:36:50 +0000
+++ tests/scripts/unity-compositor-fail-start.conf	2013-06-18 03:22:25 +0000
@@ -1,5 +1,5 @@
 #
-# Check falls back to VT swithcing when the compositor fails to start
+# Check falls back to VT switching when the compositor fails to start
 #
 
 [unity-system-compositor-config]