Flesh out support for activating sessions with CK or logind to be more explicit

[sojka/lightdm.git] / tests / scripts / switch-to-greeter-new-session.conf

diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index 5640565c114eb95b7cc1edc812afa2ea7e84fd98..fc8f2301b5017738f4f392cd171662d90ff6304a 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -6,10 +6,11 @@
 autologin-user=have-password1
 user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-0 START VT=7
+#?XSERVER-0 START VT=7 SEAT=seat0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -17,7 +18,8 @@ user-session=default
 #?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
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -26,20 +28,27 @@ user-session=default
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-1 START VT=8
+#?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
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
-#?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
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
+# Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION
+#?VT ACTIVATE VT=8
+
 # Login
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
 #?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
@@ -49,7 +58,8 @@ 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=8 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER