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 1de2069fdb7020e58cbe449989da3c8dbd4daef6..f63e74906a2f1db2bb2caaca5844e38aa456c382 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -2,57 +2,66 @@
 # Check D-Bus interface can trigger/switch to guest session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
-autologin-user=alice
+autologin-user=have-password1
+user-session=default
 
+#?*START-DAEMON
 #?RUNNER DAEMON-START
 #?*WAIT
 
 # 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
 
 # Default session starts
-#?SESSION :50 START USER=alice
-#?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
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to guest
 #?*SWITCH-TO-GUEST
 #?RUNNER SWITCH-TO-GUEST
 
 # 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
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :51 START USER=guest-.*
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?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
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0