Merge from trunk

[sojka/lightdm.git] / tests / scripts / unity-compositor-command.conf

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index 716461b6adc6a9f506547c4cd827bda8e85bfe41..7edc35e021201a855b413a3f464cff672ab060d4 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -10,25 +10,26 @@ unity-compositor-command=unity-system-compositor --test
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7 TEST=TRUE
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7 TEST=TRUE
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
-#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 START MIR-ID=x-0
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON