Merge lp:~robert-ancell/lightdm/unity-plymouth-fix into lp:lightdm

[Robert Ancell]

Add in handling of "plymouth quit" when using the compositor to send the plymouth commands to deactivate and quit.

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1708
http://jenkins.qa.ubuntu.com/job/lightdm-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-07-16 22:06:06 +0000
+++ src/seat-unity.c	2013-07-19 11:09:27 +0000
@@ -146,6 +146,12 @@
              close (fd);
          }
     }
+
+    if (seat->priv->stopping_plymouth)
+    {      
+        seat->priv->stopping_plymouth = FALSE;
+        plymouth_quit (TRUE);
+    }  
 }
 
 static void
@@ -309,6 +315,7 @@
         if (active_vt >= vt_get_min ())
         {
             g_debug ("Compositor will replace Plymouth");
+            SEAT_UNITY (seat)->priv->stopping_plymouth = TRUE;
             SEAT_UNITY (seat)->priv->vt = active_vt;
             plymouth_deactivate ();
         }
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-07-19 09:44:06 +0000
+++ tests/Makefile.am	2013-07-19 11:09:27 +0000
@@ -162,7 +162,8 @@
 	test-unity-compositor-fail-ready \
 	test-unity-autologin \
 	test-unity-login \
-	test-unity-switch
+	test-unity-switch \
+	test-unity-plymouth
 
 #	test-session-exit-error
 #	test-greeter-no-exit
@@ -370,6 +371,7 @@
 	scripts/unity-compositor-fail-ready.conf \
 	scripts/unity-compositor-fail-start.conf \
 	scripts/unity-login.conf \
+	scripts/unity-plymouth.conf \
 	scripts/unity-switch.conf \
 	scripts/users.conf \
 	scripts/util-path.conf \
 
=== added file 'tests/scripts/unity-plymouth.conf'
--- tests/scripts/unity-plymouth.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/unity-plymouth.conf	2013-07-19 11:09:27 +0000
@@ -0,0 +1,49 @@
+#
+# Check Plymouth quits when Unity System compositor server is started.  Plymouth is on an active VT so it handshakes with u-s-c.
+#
+
+[SeatDefaults]
+type=unity
+autologin-user=have-password1
+user-session=default
+
+[test-plymouth-config]
+enabled=true
+has-active-vt=true
+active=true
+
+#?RUNNER DAEMON-START
+
+# Check if Plymouth is running
+#?PLYMOUTH PING ACTIVE=TRUE
+#?PLYMOUTH HAS-ACTIVE-VT=TRUE
+#?PLYMOUTH DEACTIVATE
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# Plymouth quits but keeps image in framebuffer
+#?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
+
+# X server starts
+#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 INDICATE-READY
+   
+# LightDM connects to X server
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# System compositor switches to session
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
 
=== added file 'tests/test-unity-plymouth'
--- tests/test-unity-plymouth	1970-01-01 00:00:00 +0000
+++ tests/test-unity-plymouth	2013-07-19 11:09:27 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-plymouth test-gobject-greeter