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

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

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index 79902b88feacf7f416d5d0c6d3d5243ba67bfa75..f63e74906a2f1db2bb2caaca5844e38aa456c382 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -2,18 +2,16 @@
 # Check D-Bus interface can trigger/switch to guest session
 #
 
-[LightDM]
-disable-guest-wrapper=true
-
 [SeatDefaults]
 autologin-user=have-password1
 user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 #?*WAIT
 
 # 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
@@ -21,7 +19,8 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Default session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default 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
 
@@ -30,7 +29,7 @@ user-session=default
 #?RUNNER SWITCH-TO-GUEST
 
 # 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
@@ -40,20 +39,22 @@ user-session=default
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
-# Switch to session
-#?VT ACTIVATE VT=8
-
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION
+#?VT ACTIVATE VT=8
+
 # Switch again, should not do anything as guest already running
 #?*SWITCH-TO-GUEST
 #?RUNNER SWITCH-TO-GUEST
+#?LOGIN1 ACTIVATE-SESSION
 #?*WAIT
 
 # Cleanup