diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-05-17 03:51:10 +0000 |
|---|---|---|
| committer | Tarmac <> | 2013-05-17 03:51:10 +0000 |
| commit | 98154277ec77bdbd39eada6cb6a616159c2abb0c (patch) | |
| tree | c52309b67ea3605ce52eaccefcc002fa28af231b /tests/scripts/login-guest.conf | |
| parent | 918fb7295d73686f97c75535b8463e8af93e2015 (diff) | |
| parent | 49723c2ffcd96b2a118ec8165a2865e891667ac5 (diff) | |
| download | lightdm-98154277ec77bdbd39eada6cb6a616159c2abb0c.tar.gz | |
Refactor tests so each object is only required to be in sequence - stops race conditions between each component reporting status
Override XCB to make X tests reliable and predictable, now can't conflict with existing X servers
Remove keyboard layout and variant tests as they rely on specific X/xkb behaviour
Remove sync hack that was avoiding the race conditions.
Approved by Robert Ancell, PS Jenkins bot.
Diffstat (limited to 'tests/scripts/login-guest.conf')
| -rw-r--r-- | tests/scripts/login-guest.conf | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 4e46af10..020ddcaf 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -2,43 +2,39 @@ # Check can login as guest (not prompted for password) # -[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 # Login as guest -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?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|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 |