explicitly provide shared dir path to sessions

[sojka/lightdm.git] / tests / scripts / login-session-crash.conf

diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index bf37260d1cca985f646b06e4fcfee8025a88d88c..ed713ae24c0ba414a9c08cf9e5dc84587cfe228d 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -2,64 +2,62 @@
 # Check if session crashes then returned to greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
-[test-greeter-config]
-username=alice
-password=password
+[SeatDefaults]
+user-session=default
 
 #?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
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
-
-# Login as alice
-#?GREETER :50 AUTHENTICATE USERNAME=alice
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-#?GREETER :50 TERMINATE SIGNAL=15
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Log into an account with a password
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # 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
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Crash session
-#?*SESSION :50 CRASH
+#?*SESSION-X-0 CRASH
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # 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
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0