diff options
| author | Michael Terry <michael.terry@canonical.com> | 2013-10-28 11:26:39 -0700 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2013-10-28 11:26:39 -0700 |
| commit | 8130cf52e3f81c016dbd09a417d474f7a5f920bf (patch) | |
| tree | 505be27dfce3b3f399f274176f9a66116bba666a /tests | |
| parent | e6001ae27eb36d5609ff92cea449b15e6596b7f1 (diff) | |
| download | lightdm-8130cf52e3f81c016dbd09a417d474f7a5f920bf.tar.gz | |
Fix typo and add test that would have caught it
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/scripts/unity-compositor-mir-next-session.conf | 42 | ||||
| -rwxr-xr-x | tests/test-unity-compositor-mir-next-session | 2 |
3 files changed, 45 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c5cbe85a..996ef8ac 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -151,6 +151,7 @@ TESTS = \ test-unity-compositor-fail-start \ test-unity-compositor-fail-ready \ test-unity-compositor-next-session \ + test-unity-compositor-mir-next-session \ test-unity-autologin \ test-unity-login \ test-unity-switch \ diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf new file mode 100644 index 00000000..cfb95e82 --- /dev/null +++ b/tests/scripts/unity-compositor-mir-next-session.conf @@ -0,0 +1,42 @@ +# +# Check that we correctly set next session when switching selected greeter user in Mir +# + +[SeatDefaults] +type=unity +user-session=mir +autologin-user=have-password2 +autologin-in-background=true + +#?RUNNER DAEMON-START + +# System compositor +#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7 +#?*UNITY-SYSTEM-COMPOSITOR READY + +# Greeter session +#?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 +#?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON +#?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON + +# Background session +#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password2 + +# System compositor switches to greeter +#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0 + +# Switch to user without a session +#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-MIR-greeter-0 SHOW-PROMPT TEXT="Password:" + +# Switch to user with a session +#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=have-password2 +#?GREETER-MIR-greeter-0 SHOW-PROMPT TEXT="Password:" +#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=session-0 + +# Cleanup +#?*STOP-DAEMON +#?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15 +#?SESSION-MIR-session-0 TERMINATE SIGNAL=15 +#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/test-unity-compositor-mir-next-session b/tests/test-unity-compositor-mir-next-session new file mode 100755 index 00000000..cda2ca5a --- /dev/null +++ b/tests/test-unity-compositor-mir-next-session @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner unity-compositor-mir-next-session test-mir-greeter |