1 files changed, 21 insertions, 25 deletions
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 5010b038..de0e4371 100644
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -2,43 +2,39 @@
 # Check we handle conversations during each PAM method
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?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
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=log-pam
-#?GREETER :50 SHOW-MESSAGE TEXT="pam_authenticate"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 SHOW-MESSAGE TEXT="pam_acct_mgmt"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=log-pam
+#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_authenticate"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_acct_mgmt"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION :50 START USER=log-pam
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=log-pam
+#?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