diff options
Diffstat (limited to 'tests/scripts/login-logout.conf')
| -rw-r--r-- | tests/scripts/login-logout.conf | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index db0f1b36..5b50d7fa 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -2,61 +2,57 @@ # Check logging out returns to the greeter # -[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 in -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*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=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # 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 +#?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 # 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 |