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 4580b9953d89809f7686ad355e87195c9c766ebb..fd45d1544a215c145e081e5566b240631ce0cee1 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -2,60 +2,75 @@
 # Check can lock a session from D-Bus and can return to it
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
+user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-0 START VT=7 SEAT=seat0
 
-# LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?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
 
 # Lock the session
-#?*SESSION :50 LOCK-SESSION
-#?SESSION :50 LOCK-SESSION
+#?*SESSION-X-0 LOCK-SESSION
+#?SESSION-X-0 LOCK-SESSION
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-1 START VT=8 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
 
-# LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+# Session is locked
+#?LOGIN1 LOCK-SESSION
 
 # Greeter starts with session user selected
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
-#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1    
-#?GREETER :51 LOCK-HINT
+#?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
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?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 :51 AUTHENTICATE USERNAME=have-password1
-#?GREETER :51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :51 RESPOND TEXT="password"
-#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :51 START-SESSION
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?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 :51 TERMINATE SIGNAL=15
-#?XSERVER :51 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0