diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-11-20 14:50:21 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-11-20 14:50:21 +1300 |
| commit | 97097df137829bd0e5c4af632a619998019a1f1d (patch) | |
| tree | b8353117d56649bb98b798d1704dc86c17185dd4 | |
| parent | 74c5cddebdc739878d3e6cfa69ec0a6ea7c1d02a (diff) | |
| download | lightdm-git-97097df137829bd0e5c4af632a619998019a1f1d.tar.gz | |
Add some missing tests
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -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 | ||||
| -rwxr-xr-x | tests/test-xdmcp-server-autologin | 2 | ||||
| -rwxr-xr-x | tests/test-xdmcp-server-double-login | 2 | ||||
| -rwxr-xr-x | tests/test-xdmcp-server-guest | 2 |
7 files changed, 13 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8b02650a..f647ddf2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -164,7 +164,10 @@ TESTS = \ test-xremote-login \ test-xdmcp-client \ test-xdmcp-client-xorg-1.16 \ + test-xdmcp-server-autologin \ test-xdmcp-server-login \ + test-xdmcp-server-double-login \ + test-xdmcp-server-guest \ test-xdmcp-server-keep-alive \ test-xdmcp-server-xdm-authentication \ test-xdmcp-server-xdm-authentication-missing-data \ diff --git a/tests/scripts/xdmcp-server-autologin.conf b/tests/scripts/xdmcp-server-autologin.conf index cc151de5..22c4d06c 100644 --- a/tests/scripts/xdmcp-server-autologin.conf +++ b/tests/scripts/xdmcp-server-autologin.conf @@ -33,7 +33,7 @@ autologin-user=have-password1 #?XSERVER-98 ACCEPT-CONNECT # Session starts -#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff --git a/tests/scripts/xdmcp-server-double-login.conf b/tests/scripts/xdmcp-server-double-login.conf index 455b4dc2..034f917b 100644 --- a/tests/scripts/xdmcp-server-double-login.conf +++ b/tests/scripts/xdmcp-server-double-login.conf @@ -48,7 +48,7 @@ user-session=default #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER @@ -86,7 +86,7 @@ user-session=default #?GREETER-X-127.0.0.1:99 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-127.0.0.1:99 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?SESSION-X-127.0.0.1:99 START DESKTOP_SESSION=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-99 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:99 CONNECT-XSERVER diff --git a/tests/scripts/xdmcp-server-guest.conf b/tests/scripts/xdmcp-server-guest.conf index dc95f979..b5402563 100644 --- a/tests/scripts/xdmcp-server-guest.conf +++ b/tests/scripts/xdmcp-server-guest.conf @@ -49,7 +49,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.* +#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=guest-.* #?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff --git a/tests/test-xdmcp-server-autologin b/tests/test-xdmcp-server-autologin new file mode 100755 index 00000000..3f195362 --- /dev/null +++ b/tests/test-xdmcp-server-autologin @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-server-autologin test-gobject-greeter diff --git a/tests/test-xdmcp-server-double-login b/tests/test-xdmcp-server-double-login new file mode 100755 index 00000000..4afb8b15 --- /dev/null +++ b/tests/test-xdmcp-server-double-login @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-server-double-login test-gobject-greeter diff --git a/tests/test-xdmcp-server-guest b/tests/test-xdmcp-server-guest new file mode 100755 index 00000000..967098ef --- /dev/null +++ b/tests/test-xdmcp-server-guest @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-server-guest test-gobject-greeter |