diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
| commit | 2951f3ad5d4937e76883502842ccc0074cc75862 (patch) | |
| tree | 937d15cc97468bcbacbccf1f953dbc07b8755238 /tests | |
| parent | e02cee89092b183898e7d8e539a16e663b3921e3 (diff) | |
| parent | baf1027424c79b584a6305b7c143766141e6767d (diff) | |
| download | lightdm-2951f3ad5d4937e76883502842ccc0074cc75862.tar.gz | |
Merge with trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scripts/autologin-session.conf | 65 | ||||
| -rwxr-xr-x | tests/test-autologin-session | 2 |
3 files changed, 69 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ad167999..d509c135 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,6 +46,7 @@ TESTS = \ test-cred-unavail \ test-autologin-session-error \ test-autologin-logout \ + test-autologin-session \ test-autologin-timeout-logout \ test-autologin-previous-session \ test-autologin-guest \ @@ -382,6 +383,7 @@ EXTRA_DIST = \ scripts/autologin-new-authtok.conf \ scripts/autologin-password.conf \ scripts/autologin-previous-session.conf \ + scripts/autologin-session.conf \ scripts/autologin-session-crash.conf \ scripts/autologin-session-error.conf \ scripts/autologin-timeout.conf \ diff --git a/tests/scripts/autologin-session.conf b/tests/scripts/autologin-session.conf new file mode 100644 index 00000000..2cd70b30 --- /dev/null +++ b/tests/scripts/autologin-session.conf @@ -0,0 +1,65 @@ +# +# Check can pick a particular session for automatic logins +# + +[Seat:*] +autologin-user=have-password1 +user-session=default +autologin-session=alternative + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Autologin 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=alternative NAME=alternative USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Logout session +#?*SESSION-X-0 LOGOUT + +# X server stops +#?XSERVER-0 TERMINATE SIGNAL=15 + +# X server starts +#?XSERVER-0 START VT=7 SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Greeter starts +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Log into user session, check it doesn't use the autologin session +#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1 +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 +#?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/test-autologin-session b/tests/test-autologin-session new file mode 100755 index 00000000..ddee1978 --- /dev/null +++ b/tests/test-autologin-session @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner autologin-session test-gobject-greeter |