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

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

diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
index 4102ec101b176c158b8d80b5e45af866b863c8bb..1ed69c652a54ea2c64a43fd9e049e543e16212be 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.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 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
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -26,7 +28,7 @@ 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
@@ -37,13 +39,14 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?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 as existing user
@@ -57,6 +60,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to session
+#?LOGIN1 ACTIVATE-SESSION
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop
@@ -68,13 +72,14 @@ user-session=default
 #?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-0 START VT=7
+#?XSERVER-0 START VT=7 SEAT=seat0
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON