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

[sojka/lightdm.git] / tests / scripts / login-new-authtok.conf

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index abb3644579ab4d8f84941bc30a119835b1bc12b5..aa706202065418298a21338b355eb44b4518d862 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -2,41 +2,44 @@
 # Check prompted to change password
 #
 
-[LightDM]
-minimum-display-number=50
+[SeatDefaults]
+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
 
 # 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
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account that requires as password change
-#?*GREETER :50 AUTHENTICATE USERNAME=new-authtok
-#?GREETER :50 SHOW-PROMPT TEXT="Enter new password:"
-#?*GREETER :50 RESPOND TEXT="New password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok
+#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password \(expired\):"
+#?*GREETER-X-0 RESPOND TEXT="New password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION :50 START USER=new-authtok
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok DESKTOP_SESSION=default USER=new-authtok
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0