diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-14 17:00:30 +0100 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-14 17:00:30 +0100 |
commit | 2bd4dab1a29df610e4cd07c9d89cdc8d6cd43fc9 (patch) | |
tree | 445f924570f61311b2a98f8779c48e4ec900ed37 /tests/scripts | |
parent | 819a37da75251b5fee553721e25cf30d07fc950a (diff) | |
download | lightdm-2bd4dab1a29df610e4cd07c9d89cdc8d6cd43fc9.tar.gz |
Check the version of the X server we are running so we correctly pass -listen tcp when required.
Also add tests for xserver-allow-tcp function and check in all cases we are listening on tcp/unix only when appropriate.
Diffstat (limited to 'tests/scripts')
-rw-r--r-- | tests/scripts/allow-tcp-xorg-1.16.conf | 34 | ||||
-rw-r--r-- | tests/scripts/allow-tcp-xorg-1.17.conf | 34 | ||||
-rw-r--r-- | tests/scripts/xdmcp-client.conf | 2 | ||||
-rw-r--r-- | tests/scripts/xdmcp-server-autologin.conf | 2 | ||||
-rw-r--r-- | tests/scripts/xdmcp-server-double-login.conf | 4 | ||||
-rw-r--r-- | tests/scripts/xdmcp-server-guest.conf | 2 | ||||
-rw-r--r-- | tests/scripts/xdmcp-server-login.conf | 2 | ||||
-rw-r--r-- | tests/scripts/xdmcp-server-open-file-descriptors.conf | 2 |
8 files changed, 75 insertions, 7 deletions
diff --git a/tests/scripts/allow-tcp-xorg-1.16.conf b/tests/scripts/allow-tcp-xorg-1.16.conf new file mode 100644 index 00000000..bd6341ae --- /dev/null +++ b/tests/scripts/allow-tcp-xorg-1.16.conf @@ -0,0 +1,34 @@ +# +# Check can enable TCP listening in X.Org < 1.17 (default is listening enabled) +# + +[test-xserver-config] +version=1.16.0 + +[Seat:*] +autologin-user=have-password1 +user-session=default +xserver-allow-tcp=true + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/allow-tcp-xorg-1.17.conf b/tests/scripts/allow-tcp-xorg-1.17.conf new file mode 100644 index 00000000..14b59151 --- /dev/null +++ b/tests/scripts/allow-tcp-xorg-1.17.conf @@ -0,0 +1,34 @@ +# +# Check can enable TCP listening in X.Org >= 1.17 (default is listening disabled) +# + +[test-xserver-config] +version=1.17.0 + +[Seat:*] +autologin-user=have-password1 +user-session=default +xserver-allow-tcp=true + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client.conf index b24860a9..f29bb41c 100644 --- a/tests/scripts/xdmcp-client.conf +++ b/tests/scripts/xdmcp-client.conf @@ -9,7 +9,7 @@ xdmcp-manager=127.0.0.1 #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 SEAT=seat0 +#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/xdmcp-server-autologin.conf b/tests/scripts/xdmcp-server-autologin.conf index dd7a9502..92a45f1d 100644 --- a/tests/scripts/xdmcp-server-autologin.conf +++ b/tests/scripts/xdmcp-server-autologin.conf @@ -18,7 +18,7 @@ autologin-user=have-password1 # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" -#?XSERVER-98 START +#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-98 START-XDMCP diff --git a/tests/scripts/xdmcp-server-double-login.conf b/tests/scripts/xdmcp-server-double-login.conf index 552f4be7..bc3acdbe 100644 --- a/tests/scripts/xdmcp-server-double-login.conf +++ b/tests/scripts/xdmcp-server-double-login.conf @@ -17,7 +17,7 @@ user-session=default # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" -#?XSERVER-98 START +#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-98 START-XDMCP @@ -56,7 +56,7 @@ user-session=default # Start a second remote X server to log in with XDMCP #?*START-XSERVER ARGS=":99 -query 127.0.0.1 -nolisten unix" -#?XSERVER-99 START +#?XSERVER-99 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-99 START-XDMCP diff --git a/tests/scripts/xdmcp-server-guest.conf b/tests/scripts/xdmcp-server-guest.conf index 1fb8869f..6f5301de 100644 --- a/tests/scripts/xdmcp-server-guest.conf +++ b/tests/scripts/xdmcp-server-guest.conf @@ -17,7 +17,7 @@ user-session=default # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" -#?XSERVER-98 START +#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-98 START-XDMCP diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf index c73f855d..fb3f8090 100644 --- a/tests/scripts/xdmcp-server-login.conf +++ b/tests/scripts/xdmcp-server-login.conf @@ -17,7 +17,7 @@ user-session=default # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" -#?XSERVER-98 START +#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-98 START-XDMCP diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf index 28719e7c..c0c89f4a 100644 --- a/tests/scripts/xdmcp-server-open-file-descriptors.conf +++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf @@ -17,7 +17,7 @@ user-session=default # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" -#?XSERVER-98 START +#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX # Start sending XDMCP queries #?*XSERVER-98 START-XDMCP |