Merge from trunk

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

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index 939738c88cf3e240b0f10dba3fcce75aa5d98419..170404e02a2091daba1064dbf3b18e3429bf49c8 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -10,44 +10,49 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*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
 
 # Session starts
-#?SESSION-X-0 START USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default 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
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-1 START MIR-ID=1
-#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 START MIR-ID=x-1
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Lock session
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
-#?GREETER-X-1 START
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-1
 
 # Login
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
@@ -58,7 +63,7 @@ user-session=default
 #?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-1 START USER=have-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -67,25 +72,26 @@ user-session=default
 #?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-1 START MIR-ID=2
-#?XSERVER-1 INDICATE-READY
-#?XSERVER-1 ACCEPT-CONNECT
+#?XSERVER-2 START MIR-ID=x-2
+#?*XSERVER-2 INDICATE-READY
+#?XSERVER-2 INDICATE-READY
+#?XSERVER-2 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-1 START
-#?XSERVER-1 ACCEPT-CONNECT
-#?GREETER-X-1 CONNECT-XSERVER
-#?GREETER-X-1 CONNECT-TO-DAEMON
-#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-2 ACCEPT-CONNECT
+#?GREETER-X-2 CONNECT-XSERVER
+#?GREETER-X-2 CONNECT-TO-DAEMON
+#?GREETER-X-2 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=2
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-2
 
 # Cleanup
 #?*STOP-DAEMON
 #?SESSION-X-0 TERMINATE SIGNAL=15
 #?XSERVER-0 TERMINATE SIGNAL=15
-#?GREETER-X-1 TERMINATE SIGNAL=15
-#?XSERVER-1 TERMINATE SIGNAL=15
+#?GREETER-X-2 TERMINATE SIGNAL=15
+#?XSERVER-2 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0