Override logind's or consolekit's decision to automatically change active session...

[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 513c98a13205810d65cd09010a837f265cd49280..d43ef18d262db798687afe436e9a1a53ca226e63 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -2,62 +2,71 @@
 # Use D-Bus interface to show the greeter, then start a new session
 #
 
-[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
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # 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
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
+#?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 SESSION=c1
+#?VT ACTIVATE VT=8
 
 # Login
-#?*GREETER :51 AUTHENTICATE USERNAME=have-password2
-#?GREETER :51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :51 RESPOND TEXT="password"
-#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
-#?*GREETER :51 START-SESSION
-#?GREETER :51 TERMINATE SIGNAL=15
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION :51 START USER=have-password2
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?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 SESSION=c2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # 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)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0