summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Terry <michael.terry@canonical.com>2012-09-27 01:01:36 -0400
committerMichael Terry <michael.terry@canonical.com>2012-09-27 01:01:36 -0400
commitf632e90c7d4bcd31bec7951b829575dc48a16efd (patch)
tree18fdf496d28cb23abf7e3612a07827299acf2b36 /tests
parenta28b5b8b0fcb836efc42090510b00f494c773356 (diff)
downloadlightdm-f632e90c7d4bcd31bec7951b829575dc48a16efd.tar.gz
tests: we can't guarantee the order of vnc-client-connect and x's accept-connect, so allow them in either order
Diffstat (limited to 'tests')
-rw-r--r--tests/scripts/vnc-login.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index d64c29ae..0c6199e9 100644
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -26,10 +26,9 @@ port=9999
#?XSERVER :50 INDICATE-READY
-#?XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
-
-# LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+# LightDM and vnc-client connect to X server
+#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
+#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
# Greeter starts and connects to remote X server
#?GREETER :50 START