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/vnc-dimensions.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/vnc-dimensions.conf')
| -rw-r--r-- | tests/scripts/vnc-dimensions.conf | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf index b1d99d47..93b16f0d 100644 --- a/tests/scripts/vnc-dimensions.conf +++ b/tests/scripts/vnc-dimensions.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 start-default-seat=false [VNCServer] @@ -22,9 +21,23 @@ depth=16 #?VNC-CLIENT CONNECT SERVER=::9999 # Xvnc server starts -#?XSERVER :50 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE +#?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE + +# Negotiate with Xvnc +#?VNC-CLIENT CONNECTED VERSION="RFB 003.007" +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XSERVER-0 ACCEPT-CONNECT + +# Greeter starts and connects to remote X server +#?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 # Clean up #?*STOP-DAEMON -#?XSERVER :50 TERMINATE SIGNAL=15 +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 |