Override logind's or consolekit's decision to automatically change active session...

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

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index fec9f1c2bec70d90a2a50db05653ab966c2f1556..72c729428ddca72b6ced46ff991ed4af58d5349a 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -7,14 +7,15 @@ type=unity
 autologin-user=have-password1
 user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -22,19 +23,20 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 START SEAT=seat0 MIR-ID=x-1
 
 # Daemon connects when X server is ready
 #?*XSERVER-1 INDICATE-READY
@@ -45,14 +47,15 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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
@@ -63,7 +66,8 @@ user-session=default
 #?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -72,20 +76,21 @@ user-session=default
 #?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-2 START MIR-ID=2
+#?XSERVER-2 START SEAT=seat0 MIR-ID=x-2
 #?*XSERVER-2 INDICATE-READY
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?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