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

[sojka/lightdm.git] / tests / scripts / lock-session-return-session.conf

diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index 08d29d17bbff30b2b6af9a0ef81f7398337ae3d5..fd45d1544a215c145e081e5566b240631ce0cee1 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -4,18 +4,22 @@
 
 [SeatDefaults]
 autologin-user=have-password1
+user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-0 START
-#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 START VT=7 SEAT=seat0
 
-# 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 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
 
@@ -24,14 +28,18 @@ autologin-user=have-password1
 #?SESSION-X-0 LOCK-SESSION
 
 # New X server starts
-#?XSERVER-1 START
-#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 START VT=8 SEAT=seat0
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts with session user selected
-#?GREETER-X-1 START
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -39,6 +47,10 @@ autologin-user=have-password1
 #?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1    
 #?GREETER-X-1 LOCK-HINT
 
+# Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?VT ACTIVATE VT=8
+
 # Login as existing user
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
 #?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
@@ -46,6 +58,13 @@ autologin-user=have-password1
 #?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-1 START-SESSION
 
+# Existing session is unlocked
+#?LOGIN1 UNLOCK-SESSION
+
+# Return to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?VT ACTIVATE VT=7
+
 # Greeter and X server stop
 #?GREETER-X-1 TERMINATE SIGNAL=15
 #?XSERVER-1 TERMINATE SIGNAL=15