diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-05-17 15:10:13 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-05-17 15:10:13 +1200 |
| commit | 49723c2ffcd96b2a118ec8165a2865e891667ac5 (patch) | |
| tree | c52309b67ea3605ce52eaccefcc002fa28af231b /tests/scripts/autologin-session-error.conf | |
| parent | c2948bc534f99f8af0c8a726dce89d290c47e383 (diff) | |
| download | lightdm-49723c2ffcd96b2a118ec8165a2865e891667ac5.tar.gz | |
Override XCB to make X tests reliable and predictable. Had to remove keyboard layout and variant tests as they rely on specific X/xkb behaviour
Diffstat (limited to 'tests/scripts/autologin-session-error.conf')
| -rw-r--r-- | tests/scripts/autologin-session-error.conf | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index ccd6e30d..0b72aacc 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -2,42 +2,39 @@ # Check automatic login stops if an account can't open a session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=session-error #?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 # (Session fails) # 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-X-50 START -#?XSERVER-50 ACCEPT-CONNECT -#?GREETER-X-50 CONNECT-XSERVER -#?GREETER-X-50 CONNECT-TO-DAEMON -#?GREETER-X-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 -#?GREETER-X-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 |