diff options
Diffstat (limited to 'tests/scripts/script-hook-fail-session-setup.conf')
| -rw-r--r-- | tests/scripts/script-hook-fail-session-setup.conf | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 3575342b..81519cac 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -2,9 +2,6 @@ # Check LightDM stops returns to the greeter if the session setup script fails # -[LightDM] -minimum-display-number=50 - [SeatDefaults] session-setup-script=test-script-hook SESSION-SETUP 1 autologin-user=have-password1 @@ -12,25 +9,24 @@ autologin-user=have-password1 #?RUNNER DAEMON-START # One X server should start by default -#?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 # Setup script fails #?SCRIPT-HOOK SESSION-SETUP # 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 |