summaryrefslogtreecommitdiff
path: root/tests/scripts/login-pam.conf
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-02-20 17:55:47 +0000
committerRobert Ancell <robert.ancell@canonical.com>2013-02-20 17:55:47 +0000
commit9cd6dbcbc0ef1571e83686e4acb7c1e648859d4c (patch)
tree417d45e189de587a3f924bcd2d4b72c76ce6cdf9 /tests/scripts/login-pam.conf
parent8b078143c6983f632e6aa1fa250c187a5dcf8d1d (diff)
downloadlightdm-9cd6dbcbc0ef1571e83686e4acb7c1e648859d4c.tar.gz
Refactor tests
Diffstat (limited to 'tests/scripts/login-pam.conf')
-rw-r--r--tests/scripts/login-pam.conf43
1 files changed, 21 insertions, 22 deletions
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 5010b038..23b6bc3f 100644
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -8,37 +8,36 @@ minimum-display-number=50
#?RUNNER DAEMON-START
# X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
# LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 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-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 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-50 AUTHENTICATE USERNAME=log-pam
+#?GREETER-X-50 SHOW-MESSAGE TEXT="pam_authenticate"
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 RESPOND TEXT="password"
+#?GREETER-X-50 SHOW-MESSAGE TEXT="pam_acct_mgmt"
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
# Session starts
-#?SESSION :50 START USER=log-pam
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=log-pam
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
#?RUNNER DAEMON-EXIT STATUS=0