diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-07-22 15:13:13 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-07-22 15:13:13 +1200 |
| commit | 8392eb782532b5d529dbfe16e154ac3844197c55 (patch) | |
| tree | 38ea736bee127affa398f293de95dc35a7b6e08c /tests | |
| parent | 608e4e023da640a4127633fdea4e98e7360b0857 (diff) | |
| download | lightdm-8392eb782532b5d529dbfe16e154ac3844197c55.tar.gz | |
Add back the greeter guest account hint
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scripts/greeter-allow-guest.conf | 32 | ||||
| -rw-r--r-- | tests/src/test-gobject-greeter.c | 2 | ||||
| -rwxr-xr-x | tests/test-greeter-allow-guest | 2 |
4 files changed, 38 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 0c5371b9..ec738337 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,7 @@ TESTS = \ test-greeter-xserver-crash \ test-greeter-wrapper \ test-greeter-default-session \ + test-greeter-allow-guest \ test-greeter-hide-users \ test-greeter-show-manual-login \ test-greeter-show-remote-login \ @@ -290,6 +291,7 @@ EXTRA_DIST = \ scripts/dbus.conf \ scripts/denied.conf \ scripts/expired.conf \ + scripts/greeter-allow-guest.conf \ scripts/greeter-default-session.conf \ scripts/greeter-fail-start.conf \ scripts/greeter-hide-users.conf \ diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf new file mode 100644 index 00000000..1bfc477a --- /dev/null +++ b/tests/scripts/greeter-allow-guest.conf @@ -0,0 +1,32 @@ +# +# Check greeter is informed if manual login should be showed (it defaults to show) +# + +[SeatDefaults] +greeter-allow-guest=false + +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 + +# 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 +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Check has correct hint to allow guest +#?GREETER-X-0 HAS-GUEST-ACCOUNT-HINT=FALSE + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index 5e4456c3..36c2b85e 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -368,6 +368,8 @@ main (int argc, char **argv) status_notify ("%s SELECT-GUEST-HINT", greeter_id); if (lightdm_greeter_get_lock_hint (greeter)) status_notify ("%s LOCK-HINT", greeter_id); + if (!lightdm_greeter_get_has_guest_account_hint (greeter)) + status_notify ("%s HAS-GUEST-ACCOUNT-HINT=FALSE", greeter_id); if (lightdm_greeter_get_hide_users_hint (greeter)) status_notify ("%s HIDE-USERS-HINT", greeter_id); if (lightdm_greeter_get_show_manual_login_hint (greeter)) diff --git a/tests/test-greeter-allow-guest b/tests/test-greeter-allow-guest new file mode 100755 index 00000000..f7d0d8e8 --- /dev/null +++ b/tests/test-greeter-allow-guest @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner greeter-allow-guest test-gobject-greeter |