diff options
author | Laércio de Sousa <lbsousajr@gmail.com> | 2015-04-15 07:55:10 -0300 |
---|---|---|
committer | Laércio de Sousa <lbsousajr@gmail.com> | 2015-04-15 07:55:10 -0300 |
commit | 152c75d3e5fcbc876865a0549dbab02101abd18b (patch) | |
tree | 6ecbe6d6e86f10e144aa86e6d151b4885e869a8e /tests/scripts | |
parent | cd05a35d7888f12756954e8dce7556e56b4f4af4 (diff) | |
download | lightdm-git-152c75d3e5fcbc876865a0549dbab02101abd18b.tar.gz |
Replace [SeatDefaults] with [Seat:*] in all test scripts
Diffstat (limited to 'tests/scripts')
164 files changed, 164 insertions, 164 deletions
diff --git a/tests/scripts/0-additional.conf b/tests/scripts/0-additional.conf index 16dd53c5..9a8aa224 100644 --- a/tests/scripts/0-additional.conf +++ b/tests/scripts/0-additional.conf @@ -1,2 +1,2 @@ -[SeatDefaults] +[Seat:*] autologin-user=have-password1 diff --git a/tests/scripts/1-additional.conf b/tests/scripts/1-additional.conf index 07fa3d93..906264f4 100644 --- a/tests/scripts/1-additional.conf +++ b/tests/scripts/1-additional.conf @@ -1,2 +1,2 @@ -[SeatDefaults] +[Seat:*] autologin-user=have-password2 diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf index 3ab14c98..7fb82ef9 100644 --- a/tests/scripts/additional-config-priority.conf +++ b/tests/scripts/additional-config-priority.conf @@ -5,7 +5,7 @@ [test-runner-config] additional-config=0-additional.conf -[SeatDefaults] +[Seat:*] autologin-user=have-password2 user-session=default diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index d5e215c5..75cf0b69 100644 --- a/tests/scripts/additional-config.conf +++ b/tests/scripts/additional-config.conf @@ -5,7 +5,7 @@ [test-runner-config] additional-config=0-additional.conf 1-additional.conf -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/additional-system-config-priority.conf b/tests/scripts/additional-system-config-priority.conf index b19a3a2f..feb2523d 100644 --- a/tests/scripts/additional-system-config-priority.conf +++ b/tests/scripts/additional-system-config-priority.conf @@ -6,7 +6,7 @@ additional-system-config=0-additional.conf additional-config=1-additional.conf -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/additional-system-config.conf b/tests/scripts/additional-system-config.conf index 68f0f344..f6b94bb3 100644 --- a/tests/scripts/additional-system-config.conf +++ b/tests/scripts/additional-system-config.conf @@ -5,7 +5,7 @@ [test-runner-config] additional-system-config=0-additional.conf 1-additional.conf -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf index 6a81c9a5..9468330e 100644 --- a/tests/scripts/autologin-guest-fail-setup-script.conf +++ b/tests/scripts/autologin-guest-fail-setup-script.conf @@ -5,7 +5,7 @@ [LightDM] guest-account-script=false -[SeatDefaults] +[Seat:*] autologin-guest=true user-session=default diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index 10dfa03e..e8e1cc4f 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -2,7 +2,7 @@ # Check automatically logs in guest while keeping a greeter up # -[SeatDefaults] +[Seat:*] autologin-guest=true autologin-in-background=true user-session=default diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index 38d31e3f..5904ad6d 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-guest=true user-session=default diff --git a/tests/scripts/autologin-guest-session-config.conf b/tests/scripts/autologin-guest-session-config.conf index 785abca0..b4830ed3 100644 --- a/tests/scripts/autologin-guest-session-config.conf +++ b/tests/scripts/autologin-guest-session-config.conf @@ -2,7 +2,7 @@ # Check automatic guest sessions use configured session # -[SeatDefaults] +[Seat:*] autologin-guest=true user-session=default guest-session=alternative diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index 52f8da1d..83bd7edb 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-guest=true autologin-user-timeout=99 user-session=default diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index 500fd662..1f5f0b90 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-guest=true user-session=default diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index 4b89171d..73a5e4bc 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user while keeping a greeter up # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 autologin-in-background=true user-session=default diff --git a/tests/scripts/autologin-invalid-greeter.conf b/tests/scripts/autologin-invalid-greeter.conf index bf7a1117..519aca62 100644 --- a/tests/scripts/autologin-invalid-greeter.conf +++ b/tests/scripts/autologin-invalid-greeter.conf @@ -2,7 +2,7 @@ # Check quits if autologin session ends and no valid greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index bd480b30..ed38fd77 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -2,7 +2,7 @@ # Check autologin fails if invalid session configured and returns to greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=invalid diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf index 527ce2c6..4e1226fe 100644 --- a/tests/scripts/autologin-invalid-user.conf +++ b/tests/scripts/autologin-invalid-user.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-user=invalid #?*START-DAEMON diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index 99bdb61f..e8b13b07 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -2,7 +2,7 @@ # Check logging out after autologin returns to greeter and doesn't autologin again # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf index dfa7d83d..2a3653da 100644 --- a/tests/scripts/autologin-new-authtok.conf +++ b/tests/scripts/autologin-new-authtok.conf @@ -2,7 +2,7 @@ # Check automatic login stops if a password change is required # -[SeatDefaults] +[Seat:*] autologin-user=new-authtok user-session=default diff --git a/tests/scripts/autologin-pam-config.conf b/tests/scripts/autologin-pam-config.conf index 2092ebb5..d9c7f7ce 100644 --- a/tests/scripts/autologin-pam-config.conf +++ b/tests/scripts/autologin-pam-config.conf @@ -2,7 +2,7 @@ # Check we can configure the PAM service for automatic login # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default pam-autologin-service=lightdm-autologin-alternative diff --git a/tests/scripts/autologin-pam.conf b/tests/scripts/autologin-pam.conf index a42bcdfc..d7e90463 100644 --- a/tests/scripts/autologin-pam.conf +++ b/tests/scripts/autologin-pam.conf @@ -2,7 +2,7 @@ # Check we correctly use PAM for automatic login # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf index 22873bb4..c48d444c 100644 --- a/tests/scripts/autologin-password.conf +++ b/tests/scripts/autologin-password.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account prompts for a password # -[SeatDefaults] +[Seat:*] autologin-user=always-password user-session=default diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 3a3d616a..b8baeeff 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -2,7 +2,7 @@ # Check automatically logs in and picks correct session # -[SeatDefaults] +[Seat:*] autologin-user=have-session #?*START-DAEMON diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index ed687adb..43ff7441 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -2,7 +2,7 @@ # Check if session crashes then returned to greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index 743168cb..93e27645 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account can't open a session # -[SeatDefaults] +[Seat:*] autologin-user=session-error user-session=default diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index cababc8d..a3f4fbdf 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user with timeout and in-background set # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 autologin-user-timeout=99 autologin-in-background=true diff --git a/tests/scripts/autologin-timeout-logout.conf b/tests/scripts/autologin-timeout-logout.conf index 69615431..4d02099e 100644 --- a/tests/scripts/autologin-timeout-logout.conf +++ b/tests/scripts/autologin-timeout-logout.conf @@ -2,7 +2,7 @@ # Check logging out after autologin returns to greeter and does timed login again # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 autologin-user-timeout=99 user-session=default diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 2b13eb38..d2d50ec9 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 autologin-user-timeout=99 user-session=default diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index a3d81499..19b0a26f 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the X server crashes inside a session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 2c03f59c..2982440c 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index ac9ac828..97dccfb4 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-login1=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/corrupt-xauthority.conf b/tests/scripts/corrupt-xauthority.conf index 1c184f8c..1b4adfbe 100644 --- a/tests/scripts/corrupt-xauthority.conf +++ b/tests/scripts/corrupt-xauthority.conf @@ -2,7 +2,7 @@ # Check can login if existing corrupt authority present # -[SeatDefaults] +[Seat:*] autologin-user=corrupt-xauth user-session=default diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index 045e5442..db3e1d98 100644 --- a/tests/scripts/crash-authenticate.conf +++ b/tests/scripts/crash-authenticate.conf @@ -2,7 +2,7 @@ # Check authentication crash on autologin is handled # -[SeatDefaults] +[Seat:*] autologin-user=crash-authenticate user-session=default diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index e5ab6d06..c18bb03f 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account can't establish credentials # -[SeatDefaults] +[Seat:*] autologin-user=cred-error user-session=default diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index 1c5e1b9f..fc9e72df 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account has expired credentials # -[SeatDefaults] +[Seat:*] autologin-user=cred-expired user-session=default diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 945d906f..a4badf33 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account can't access credentials # -[SeatDefaults] +[Seat:*] autologin-user=cred-unavail user-session=default diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf index e38c9c09..e256d5c7 100644 --- a/tests/scripts/dbus.conf +++ b/tests/scripts/dbus.conf @@ -5,7 +5,7 @@ [test-runner-config] log-dbus=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index 0044e440..7673f9ac 100644 --- a/tests/scripts/denied.conf +++ b/tests/scripts/denied.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account is denied access # -[SeatDefaults] +[Seat:*] autologin-user=denied user-session=default diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf index 9dba5acf..a611d1e8 100644 --- a/tests/scripts/expired.conf +++ b/tests/scripts/expired.conf @@ -2,7 +2,7 @@ # Check automatic login stops if an account is expired # -[SeatDefaults] +[Seat:*] autologin-user=expired user-session=default diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf index aca11a4b..099b5c3f 100644 --- a/tests/scripts/greeter-allow-guest.conf +++ b/tests/scripts/greeter-allow-guest.conf @@ -2,7 +2,7 @@ # Check greeter is informed if manual login should be showed (it defaults to show) # -[SeatDefaults] +[Seat:*] greeter-allow-guest=false #?*START-DAEMON diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf index 3fcb6034..78d82f3f 100644 --- a/tests/scripts/greeter-default-session.conf +++ b/tests/scripts/greeter-default-session.conf @@ -2,7 +2,7 @@ # Check greeter is informed of the default user session # -[SeatDefaults] +[Seat:*] user-session=alternative #?*START-DAEMON diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf index 5a8f440f..97cd3544 100644 --- a/tests/scripts/greeter-hide-users.conf +++ b/tests/scripts/greeter-hide-users.conf @@ -2,7 +2,7 @@ # Check greeter is informed if user list should be hidden # -[SeatDefaults] +[Seat:*] greeter-hide-users=true #?*START-DAEMON diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf index 2e969d82..dedfe26e 100644 --- a/tests/scripts/greeter-show-manual-login.conf +++ b/tests/scripts/greeter-show-manual-login.conf @@ -2,7 +2,7 @@ # Check greeter is informed if manual login should be showed # -[SeatDefaults] +[Seat:*] greeter-show-manual-login=true #?*START-DAEMON diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf index fb207233..4dca1edb 100644 --- a/tests/scripts/greeter-show-remote-login.conf +++ b/tests/scripts/greeter-show-remote-login.conf @@ -2,7 +2,7 @@ # Check greeter is informed if remote login should be showed (it defaults to show) # -[SeatDefaults] +[Seat:*] greeter-show-remote-login=false #?*START-DAEMON diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf index abf36ace..ce5cea38 100644 --- a/tests/scripts/greeter-wrapper.conf +++ b/tests/scripts/greeter-wrapper.conf @@ -2,7 +2,7 @@ # Check greeter wrapper works # -[SeatDefaults] +[Seat:*] greeter-wrapper=test-greeter-wrapper #?*START-DAEMON diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index f1e2a739..d214031e 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -2,7 +2,7 @@ # Check group membership is correctly set up # -[SeatDefaults] +[Seat:*] autologin-user=group-member user-session=default diff --git a/tests/scripts/guest-wrapper.conf b/tests/scripts/guest-wrapper.conf index 9a7aa0aa..85c559f7 100644 --- a/tests/scripts/guest-wrapper.conf +++ b/tests/scripts/guest-wrapper.conf @@ -2,7 +2,7 @@ # Check guest wrapper works # -[SeatDefaults] +[Seat:*] autologin-guest=true user-session=default guest-wrapper=test-guest-wrapper diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index 62f8296e..7317e862 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -2,7 +2,7 @@ # Check works for users who have their home directory created after authentication # -[SeatDefaults] +[Seat:*] autologin-user=mount-home-dir user-session=default diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index dec662b2..c9862926 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -2,7 +2,7 @@ # Check works for users who have their home directory created when the session is opened # -[SeatDefaults] +[Seat:*] autologin-user=make-home-dir user-session=default diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf index 2f18924f..c3e7396c 100644 --- a/tests/scripts/language-env.conf +++ b/tests/scripts/language-env.conf @@ -2,7 +2,7 @@ # Check language variables are set in session # -[SeatDefaults] +[Seat:*] autologin-user=have-language user-session=default diff --git a/tests/scripts/lock-seat-after-vt-switch.conf b/tests/scripts/lock-seat-after-vt-switch.conf index 82266db8..4a20ea19 100644 --- a/tests/scripts/lock-seat-after-vt-switch.conf +++ b/tests/scripts/lock-seat-after-vt-switch.conf @@ -3,7 +3,7 @@ # back to the user session and using the screensaver to unlock it. # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf index 61bd8540..8381e513 100644 --- a/tests/scripts/lock-seat-console-kit.conf +++ b/tests/scripts/lock-seat-console-kit.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-login1=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-seat-resettable.conf b/tests/scripts/lock-seat-resettable.conf index 0bf3e5bc..1c760920 100644 --- a/tests/scripts/lock-seat-resettable.conf +++ b/tests/scripts/lock-seat-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf index fbe786ec..b1b7615b 100644 --- a/tests/scripts/lock-seat-return-session-console-kit.conf +++ b/tests/scripts/lock-seat-return-session-console-kit.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-login1=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index caa39ea3..7564c5e3 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -2,7 +2,7 @@ # Check can lock a seat from D-Bus and can return to it # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index a1967a51..54de4d40 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -2,7 +2,7 @@ # Check can lock a seat from D-Bus # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 726bf785..ff92e9b4 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -2,7 +2,7 @@ # Check can lock a session from D-Bus. The session has no password so check it doesn't automatically log back in # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/lock-session-resettable.conf b/tests/scripts/lock-session-resettable.conf index 21a1bc7f..db7bbe23 100644 --- a/tests/scripts/lock-session-resettable.conf +++ b/tests/scripts/lock-session-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index ce8c46fe..43196c4e 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -2,7 +2,7 @@ # Check can lock a session from D-Bus and can return to it # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index c274a445..28c530ec 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -2,7 +2,7 @@ # Check can lock a session from D-Bus # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf index 6cb33fe9..0c15a6e8 100644 --- a/tests/scripts/login-guest-disabled.conf +++ b/tests/scripts/login-guest-disabled.conf @@ -2,7 +2,7 @@ # Check can't login to guest if account disabled # -[SeatDefaults] +[Seat:*] allow-guest=false #?*START-DAEMON diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf index e45fe6dc..3cc23271 100644 --- a/tests/scripts/login-guest-fail-setup-script.conf +++ b/tests/scripts/login-guest-fail-setup-script.conf @@ -5,7 +5,7 @@ [LightDM] guest-account-script=false -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index f31e1278..7db5e665 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -2,7 +2,7 @@ # Check automatically logs in default user # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-guest-pick-session.conf b/tests/scripts/login-guest-pick-session.conf index 72ddd59c..4685d25c 100644 --- a/tests/scripts/login-guest-pick-session.conf +++ b/tests/scripts/login-guest-pick-session.conf @@ -2,7 +2,7 @@ # Check can login as guest and pick an alternative session # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-guest-session-config.conf b/tests/scripts/login-guest-session-config.conf index 9b0ca45c..261516ea 100644 --- a/tests/scripts/login-guest-session-config.conf +++ b/tests/scripts/login-guest-session-config.conf @@ -2,7 +2,7 @@ # Check guest logins use configured session # -[SeatDefaults] +[Seat:*] user-session=default guest-session=alternative diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index fc3b7716..e2c7c5bc 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -2,7 +2,7 @@ # Check can login as guest (not prompted for password) # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index 3c2e8d0a..6d87b1fd 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -2,7 +2,7 @@ # Check logging out returns to the greeter # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index da9b03ff..52544194 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -2,7 +2,7 @@ # Check can login without a username, and is prompted for one # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index d8e5d83f..a17ef6d5 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -2,7 +2,7 @@ # Check prompted to change password # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index 0ecdf2e5..fa768fa4 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -2,7 +2,7 @@ # Check can login without password for accounts that do not have a password # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-pam-config.conf b/tests/scripts/login-pam-config.conf index bdc92426..48199767 100644 --- a/tests/scripts/login-pam-config.conf +++ b/tests/scripts/login-pam-config.conf @@ -2,7 +2,7 @@ # Check we can configure the PAM service for login # -[SeatDefaults] +[Seat:*] user-session=default pam-service=lightdm-alternative pam-greeter-service=lightdm-greeter-alternative diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 1cee123f..c9d51f55 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -2,7 +2,7 @@ # Check we correctly use PAM for login # -[SeatDefaults] +[Seat:*] user-session=default [test-pam] diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index edfcc9ad..97894644 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -2,7 +2,7 @@ # Check if session crashes then returned to greeter # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index f57a4c0f..849ffb4b 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the X server crashes inside a session # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index 5e65fb24..def8b511 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -2,7 +2,7 @@ # Check can login # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf index 1eea9373..072aafa7 100644 --- a/tests/scripts/mir-autologin.conf +++ b/tests/scripts/mir-autologin.conf @@ -2,7 +2,7 @@ # Check can automatically log into a Mir session from a VT based seat # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=mir diff --git a/tests/scripts/mir-container-session.conf b/tests/scripts/mir-container-session.conf index cb259ac0..1e32d5ec 100644 --- a/tests/scripts/mir-container-session.conf +++ b/tests/scripts/mir-container-session.conf @@ -2,7 +2,7 @@ # Check can login into a containerised Mir session on a VT based seat # -[SeatDefaults] +[Seat:*] user-session=mir-container #?*START-DAEMON diff --git a/tests/scripts/mir-script-hooks.conf b/tests/scripts/mir-script-hooks.conf index 59e5a38f..63dec803 100644 --- a/tests/scripts/mir-script-hooks.conf +++ b/tests/scripts/mir-script-hooks.conf @@ -2,7 +2,7 @@ # Check LightDM runs the script hooks correctly for autologin and the greeter # -[SeatDefaults] +[Seat:*] display-setup-script=test-script-hook DISPLAY-SETUP display-stopped-script=test-script-hook DISPLAY-STOPPED greeter-setup-script=test-script-hook GREETER-SETUP diff --git a/tests/scripts/mir-session-compositor-crash.conf b/tests/scripts/mir-session-compositor-crash.conf index 73e965d7..1bdd0b4c 100644 --- a/tests/scripts/mir-session-compositor-crash.conf +++ b/tests/scripts/mir-session-compositor-crash.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the unity compositor crashes inside a session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=mir diff --git a/tests/scripts/mir-session-crash.conf b/tests/scripts/mir-session-crash.conf index d7227ac2..369b3c33 100644 --- a/tests/scripts/mir-session-crash.conf +++ b/tests/scripts/mir-session-crash.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the Mir session crashes # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=mir diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf index 699137a7..6c192f3b 100644 --- a/tests/scripts/mir-session.conf +++ b/tests/scripts/mir-session.conf @@ -2,7 +2,7 @@ # Check can login into a Mir session on a VT based seat # -[SeatDefaults] +[Seat:*] user-session=mir #?*START-DAEMON diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index 4a0324f2..d34b0a0c 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-accounts-service=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index 4449fd5f..5fd190f1 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -6,7 +6,7 @@ disable-console-kit=true disable-login1=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index ae08ddcd..4321d168 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-console-kit=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index 4a283038..0a27779f 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -5,7 +5,7 @@ [test-runner-config] disable-login1=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index 4e8dfd78..c57f0fcd 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -3,7 +3,7 @@ # Use a greeter so its file descriptors are around at the time the session starts. # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/script-hook-display-setup-fail.conf b/tests/scripts/script-hook-display-setup-fail.conf index 903f82af..8807adb8 100644 --- a/tests/scripts/script-hook-display-setup-fail.conf +++ b/tests/scripts/script-hook-display-setup-fail.conf @@ -2,7 +2,7 @@ # Check LightDM stops if the display setup script returns an error # -[SeatDefaults] +[Seat:*] display-setup-script=test-script-hook DISPLAY-SETUP 1 #?*START-DAEMON diff --git a/tests/scripts/script-hook-display-setup-missing.conf b/tests/scripts/script-hook-display-setup-missing.conf index 06ebd06e..6903331c 100644 --- a/tests/scripts/script-hook-display-setup-missing.conf +++ b/tests/scripts/script-hook-display-setup-missing.conf @@ -2,7 +2,7 @@ # Check LightDM stops if the display setup script is missing # -[SeatDefaults] +[Seat:*] display-setup-script=test-script-hook-INVALID #?*START-DAEMON diff --git a/tests/scripts/script-hook-greeter-setup-fail.conf b/tests/scripts/script-hook-greeter-setup-fail.conf index 1c377028..ee483a49 100644 --- a/tests/scripts/script-hook-greeter-setup-fail.conf +++ b/tests/scripts/script-hook-greeter-setup-fail.conf @@ -2,7 +2,7 @@ # Check LightDM stops if the greeter setup script returns an error # -[SeatDefaults] +[Seat:*] greeter-setup-script=test-script-hook GREETER-SETUP 1 #?*START-DAEMON diff --git a/tests/scripts/script-hook-greeter-setup-missing.conf b/tests/scripts/script-hook-greeter-setup-missing.conf index 939ff35d..2599b606 100644 --- a/tests/scripts/script-hook-greeter-setup-missing.conf +++ b/tests/scripts/script-hook-greeter-setup-missing.conf @@ -2,7 +2,7 @@ # Check LightDM stops if the greeter setup script is missing # -[SeatDefaults] +[Seat:*] greeter-setup-script=test-script-hook-INVALID #?*START-DAEMON diff --git a/tests/scripts/script-hook-session-setup-fail.conf b/tests/scripts/script-hook-session-setup-fail.conf index de856ae1..5669d425 100644 --- a/tests/scripts/script-hook-session-setup-fail.conf +++ b/tests/scripts/script-hook-session-setup-fail.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the session setup script fails # -[SeatDefaults] +[Seat:*] session-setup-script=test-script-hook SESSION-SETUP 1 autologin-user=have-password1 user-session=default diff --git a/tests/scripts/script-hook-session-setup-missing.conf b/tests/scripts/script-hook-session-setup-missing.conf index 4e359330..c3635f8f 100644 --- a/tests/scripts/script-hook-session-setup-missing.conf +++ b/tests/scripts/script-hook-session-setup-missing.conf @@ -2,7 +2,7 @@ # Check LightDM returns to the greeter if the session setup script is missing # -[SeatDefaults] +[Seat:*] session-setup-script=test-script-hook-INVALID autologin-user=have-password1 user-session=default diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 89e72f4d..a159428c 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -2,7 +2,7 @@ # Check LightDM runs the script hooks correctly for autologin and the greeter # -[SeatDefaults] +[Seat:*] display-setup-script=test-script-hook DISPLAY-SETUP display-stopped-script=test-script-hook DISPLAY-STOPPED greeter-setup-script=test-script-hook GREETER-SETUP diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index f40e977b..10cfde80 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -2,7 +2,7 @@ # Check session log is backed up and restart on second login # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index d0a33ecb..26fc36bf 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -2,7 +2,7 @@ # Check session stderr is written to ~/.xsession-errors and multiple writes are appended # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 3f0b098f..b7140d7f 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -2,7 +2,7 @@ # Check session stderr is written to ~/.xsession-errors # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index 86175f56..745791b6 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -2,7 +2,7 @@ # Check session stdout is not written anywhere # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/shared-data-greeter-to-session.conf b/tests/scripts/shared-data-greeter-to-session.conf index e4fa987c..0e275619 100644 --- a/tests/scripts/shared-data-greeter-to-session.conf +++ b/tests/scripts/shared-data-greeter-to-session.conf @@ -2,7 +2,7 @@ # Make sure we can make a shared data directory to write from the greeter to the session # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/shared-data-session-to-greeter-autologin.conf b/tests/scripts/shared-data-session-to-greeter-autologin.conf index 281418d7..83a8d81a 100644 --- a/tests/scripts/shared-data-session-to-greeter-autologin.conf +++ b/tests/scripts/shared-data-session-to-greeter-autologin.conf @@ -2,7 +2,7 @@ # Make sure a shared data directory is created on autologin and can be written back to the greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/shared-data-session-to-greeter.conf b/tests/scripts/shared-data-session-to-greeter.conf index 9cadd93b..93868b81 100644 --- a/tests/scripts/shared-data-session-to-greeter.conf +++ b/tests/scripts/shared-data-session-to-greeter.conf @@ -2,7 +2,7 @@ # Make sure a shared data directory is created on login and can be written back to the greeter # -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/switch-to-greeter-disabled.conf b/tests/scripts/switch-to-greeter-disabled.conf index 23634f1b..55c8cc50 100644 --- a/tests/scripts/switch-to-greeter-disabled.conf +++ b/tests/scripts/switch-to-greeter-disabled.conf @@ -2,7 +2,7 @@ # Check can't switch to greeter when disabled # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default allow-user-switching=false diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 73427a4a..7ee5a5ec 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -2,7 +2,7 @@ # Use D-Bus interface to show the greeter, then start a new session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-greeter-resettable.conf b/tests/scripts/switch-to-greeter-resettable.conf index 7f35f118..d7dd9a40 100644 --- a/tests/scripts/switch-to-greeter-resettable.conf +++ b/tests/scripts/switch-to-greeter-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] allow-guest=false user-session=default diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index 4d29c2c5..1f5c01a1 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -2,7 +2,7 @@ # Use D-Bus interface to show the greeter, then return to the same session, then logout # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-greeter-return-session-pam.conf b/tests/scripts/switch-to-greeter-return-session-pam.conf index ea2c2e3d..7e79e57f 100644 --- a/tests/scripts/switch-to-greeter-return-session-pam.conf +++ b/tests/scripts/switch-to-greeter-return-session-pam.conf @@ -2,7 +2,7 @@ # Check we correctly use PAM for returning to an existing session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 292aa77f..2a257363 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -2,7 +2,7 @@ # Use D-Bus interface to show the greeter, then return to the same session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index e3f6f752..6e7fe18b 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -2,7 +2,7 @@ # Use D-Bus interface to show the greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-guest-disabled.conf b/tests/scripts/switch-to-guest-disabled.conf index ceca7096..9bb2fae3 100644 --- a/tests/scripts/switch-to-guest-disabled.conf +++ b/tests/scripts/switch-to-guest-disabled.conf @@ -2,7 +2,7 @@ # Check can't switch to guest when disabled # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default allow-user-switching=false diff --git a/tests/scripts/switch-to-guest-fail-resettable.conf b/tests/scripts/switch-to-guest-fail-resettable.conf index 655e4d77..23d3d093 100644 --- a/tests/scripts/switch-to-guest-fail-resettable.conf +++ b/tests/scripts/switch-to-guest-fail-resettable.conf @@ -6,7 +6,7 @@ [LightDM] guest-account-script=false -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index cc59cca1..02df3fd4 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -2,7 +2,7 @@ # Check D-Bus interface can trigger/switch to guest session # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf index 68d0dcdd..bed3938a 100644 --- a/tests/scripts/switch-to-user-active.conf +++ b/tests/scripts/switch-to-user-active.conf @@ -2,7 +2,7 @@ # Check that switching to a user who is the active session does nothing # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/switch-to-user-disabled.conf b/tests/scripts/switch-to-user-disabled.conf index c3fbc6b5..fecc6472 100644 --- a/tests/scripts/switch-to-user-disabled.conf +++ b/tests/scripts/switch-to-user-disabled.conf @@ -2,7 +2,7 @@ # Check that can't switch to a user when switching disabled # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default allow-user-switching=false diff --git a/tests/scripts/switch-to-user-existing-no-password.conf b/tests/scripts/switch-to-user-existing-no-password.conf index ba80414b..542e5952 100644 --- a/tests/scripts/switch-to-user-existing-no-password.conf +++ b/tests/scripts/switch-to-user-existing-no-password.conf @@ -2,7 +2,7 @@ # Check that switching to an existing account with no password switches straight back # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/switch-to-user-existing-resettable.conf b/tests/scripts/switch-to-user-existing-resettable.conf index cc7bd6d0..8c2c74b9 100644 --- a/tests/scripts/switch-to-user-existing-resettable.conf +++ b/tests/scripts/switch-to-user-existing-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf index 23f9101f..57478008 100644 --- a/tests/scripts/switch-to-user-existing.conf +++ b/tests/scripts/switch-to-user-existing.conf @@ -2,7 +2,7 @@ # Check that switching to an existing account with a password shows the greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-user-logout-active-resettable.conf b/tests/scripts/switch-to-user-logout-active-resettable.conf index 68fe22fa..7afc8014 100644 --- a/tests/scripts/switch-to-user-logout-active-resettable.conf +++ b/tests/scripts/switch-to-user-logout-active-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf index 784aa0e7..2dabc035 100644 --- a/tests/scripts/switch-to-user-logout-active.conf +++ b/tests/scripts/switch-to-user-logout-active.conf @@ -2,7 +2,7 @@ # Check that switching to a user and logging out the active session starts a greeter # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/switch-to-user-logout-inactive.conf b/tests/scripts/switch-to-user-logout-inactive.conf index 3e619811..a9e9bb3a 100644 --- a/tests/scripts/switch-to-user-logout-inactive.conf +++ b/tests/scripts/switch-to-user-logout-inactive.conf @@ -2,7 +2,7 @@ # Check that switching to a user and logging out the inactive session does nothing # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index 2067aea9..1e3ce19b 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -2,7 +2,7 @@ # Check that switching to a user without a password doesn't show a greeter # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/switch-to-user-resettable.conf b/tests/scripts/switch-to-user-resettable.conf index 24b5f72f..17ea1efd 100644 --- a/tests/scripts/switch-to-user-resettable.conf +++ b/tests/scripts/switch-to-user-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index 5789af4c..10ec20bf 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -2,7 +2,7 @@ # Check that switching to a user shows the greeter # -[SeatDefaults] +[Seat:*] autologin-user=no-password1 user-session=default diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index ec2c2223..725f6329 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -2,7 +2,7 @@ # Check that switching to multiple users works # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index f0212cf1..b9dd4e5e 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -5,7 +5,7 @@ [LightDM] user-authority-in-system-dir=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index 63a99702..5df08807 100644 --- a/tests/scripts/unity-autologin.conf +++ b/tests/scripts/unity-autologin.conf @@ -2,7 +2,7 @@ # Check can automatically login with Unity seat type # -[SeatDefaults] +[Seat:*] type=unity autologin-user=have-password1 user-session=default diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf index ab4d06c5..dfdede5e 100644 --- a/tests/scripts/unity-compositor-command.conf +++ b/tests/scripts/unity-compositor-command.conf @@ -2,7 +2,7 @@ # Check can set the unity compositor command # -[SeatDefaults] +[Seat:*] type=unity user-session=default unity-compositor-command=unity-system-compositor --test diff --git a/tests/scripts/unity-compositor-crash.conf b/tests/scripts/unity-compositor-crash.conf index 0994fd78..8557e731 100644 --- a/tests/scripts/unity-compositor-crash.conf +++ b/tests/scripts/unity-compositor-crash.conf @@ -2,7 +2,7 @@ # Check LightDM ? if the compositor crashes # -[SeatDefaults] +[Seat:*] type=unity #?*START-DAEMON diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf index 3d2cc6ac..d272efe5 100644 --- a/tests/scripts/unity-compositor-fail-ready.conf +++ b/tests/scripts/unity-compositor-fail-ready.conf @@ -2,7 +2,7 @@ # Check clean stop when the compositor fails to indicate it is ready # -[SeatDefaults] +[Seat:*] type=unity unity-compositor-timeout=1 diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf index 84a37aa4..254bddf8 100644 --- a/tests/scripts/unity-compositor-fail-start.conf +++ b/tests/scripts/unity-compositor-fail-start.conf @@ -5,7 +5,7 @@ [unity-system-compositor-config] return-value=1 -[SeatDefaults] +[Seat:*] type=unity #?*START-DAEMON diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf index e6033da5..22f68a03 100644 --- a/tests/scripts/unity-compositor-fallback.conf +++ b/tests/scripts/unity-compositor-fallback.conf @@ -5,7 +5,7 @@ [unity-system-compositor-config] return-value=1 -[SeatDefaults] +[Seat:*] type=unity;INVALID;unity;xlocal; #?*START-DAEMON diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf index c2bd8e5f..48cc2301 100644 --- a/tests/scripts/unity-compositor-mir-next-session.conf +++ b/tests/scripts/unity-compositor-mir-next-session.conf @@ -2,7 +2,7 @@ # Check that we correctly set next session when switching selected greeter user in Mir # -[SeatDefaults] +[Seat:*] type=unity user-session=mir autologin-user=have-password2 diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf index 6e7396e6..b8c8b1c4 100644 --- a/tests/scripts/unity-compositor-next-session.conf +++ b/tests/scripts/unity-compositor-next-session.conf @@ -2,7 +2,7 @@ # Check that we correctly set next session when switching selected greeter user # -[SeatDefaults] +[Seat:*] type=unity user-session=default autologin-user=have-password2 diff --git a/tests/scripts/unity-compositor-not-found.conf b/tests/scripts/unity-compositor-not-found.conf index ea33960a..04078d55 100644 --- a/tests/scripts/unity-compositor-not-found.conf +++ b/tests/scripts/unity-compositor-not-found.conf @@ -2,7 +2,7 @@ # Check can set the unity compositor command # -[SeatDefaults] +[Seat:*] type=unity user-session=default unity-compositor-command=unity-system-compositor-INVALID diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index 74e8dac7..00ca640c 100644 --- a/tests/scripts/unity-login.conf +++ b/tests/scripts/unity-login.conf @@ -2,7 +2,7 @@ # Check can login with Unity seat type # -[SeatDefaults] +[Seat:*] type=unity user-session=default diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf index b71c4ba0..d56c25ea 100644 --- a/tests/scripts/unity-mir-autologin.conf +++ b/tests/scripts/unity-mir-autologin.conf @@ -2,7 +2,7 @@ # Check can automatically log into a Mir session # -[SeatDefaults] +[Seat:*] type=unity autologin-user=have-password1 user-session=mir diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf index 5db4a208..cdfa832d 100644 --- a/tests/scripts/unity-mir-greeter-mir-session.conf +++ b/tests/scripts/unity-mir-greeter-mir-session.conf @@ -2,7 +2,7 @@ # Check can log into a Mir session from a Mir greeter # -[SeatDefaults] +[Seat:*] type=unity user-session=mir diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf index 1aeda18c..d96ebbb1 100644 --- a/tests/scripts/unity-mir-greeter-x-session.conf +++ b/tests/scripts/unity-mir-greeter-x-session.conf @@ -2,7 +2,7 @@ # Check can log into an X session from a Mir greeter # -[SeatDefaults] +[Seat:*] type=unity user-session=default diff --git a/tests/scripts/unity-mir-lock-seat.conf b/tests/scripts/unity-mir-lock-seat.conf index 2b36bf7b..7f89ec00 100644 --- a/tests/scripts/unity-mir-lock-seat.conf +++ b/tests/scripts/unity-mir-lock-seat.conf @@ -2,7 +2,7 @@ # Check can lock a seat from D-Bus with Mir # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 type=unity user-session=mir diff --git a/tests/scripts/unity-mir-script-hooks.conf b/tests/scripts/unity-mir-script-hooks.conf index dbf6e68e..39e2a81d 100644 --- a/tests/scripts/unity-mir-script-hooks.conf +++ b/tests/scripts/unity-mir-script-hooks.conf @@ -2,7 +2,7 @@ # Check LightDM runs the script hooks correctly for autologin and the greeter # -[SeatDefaults] +[Seat:*] type=unity display-setup-script=test-script-hook DISPLAY-SETUP display-stopped-script=test-script-hook DISPLAY-STOPPED diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf index 7937d86f..046aa578 100644 --- a/tests/scripts/unity-mir-session-x-greeter.conf +++ b/tests/scripts/unity-mir-session-x-greeter.conf @@ -2,7 +2,7 @@ # Check can log into a Mir session from an X greeter # -[SeatDefaults] +[Seat:*] type=unity user-session=mir diff --git a/tests/scripts/unity-mir-switch-to-user-resettable.conf b/tests/scripts/unity-mir-switch-to-user-resettable.conf index e59d70cc..1da8b244 100644 --- a/tests/scripts/unity-mir-switch-to-user-resettable.conf +++ b/tests/scripts/unity-mir-switch-to-user-resettable.conf @@ -3,7 +3,7 @@ # Uses a resettable greeter # -[SeatDefaults] +[Seat:*] type=unity user-session=mir diff --git a/tests/scripts/unity-mir-switch.conf b/tests/scripts/unity-mir-switch.conf index 5a95e08e..82f04e08 100644 --- a/tests/scripts/unity-mir-switch.conf +++ b/tests/scripts/unity-mir-switch.conf @@ -2,7 +2,7 @@ # Check system compositor correctly switches Mir sessions # -[SeatDefaults] +[Seat:*] type=unity autologin-user=have-password1 user-session=mir diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf index feae1adf..66f3b637 100644 --- a/tests/scripts/unity-plymouth.conf +++ b/tests/scripts/unity-plymouth.conf @@ -2,7 +2,7 @@ # Check Plymouth quits when Unity System compositor server is started. Plymouth is on an active VT so it handshakes with u-s-c. # -[SeatDefaults] +[Seat:*] type=unity autologin-user=have-password1 user-session=default diff --git a/tests/scripts/unity-script-hooks.conf b/tests/scripts/unity-script-hooks.conf index 4db13cfb..bad4a70e 100644 --- a/tests/scripts/unity-script-hooks.conf +++ b/tests/scripts/unity-script-hooks.conf @@ -2,7 +2,7 @@ # Check LightDM runs the script hooks correctly for autologin and the greeter # -[SeatDefaults] +[Seat:*] type=unity display-setup-script=test-script-hook DISPLAY-SETUP display-stopped-script=test-script-hook DISPLAY-STOPPED diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index 7444f25f..d63416ea 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -2,7 +2,7 @@ # Check system compositor correctly switches X sessions # -[SeatDefaults] +[Seat:*] type=unity autologin-user=have-password1 user-session=default diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf index 6ca6b407..c9a9cf0f 100644 --- a/tests/scripts/upstart-autologin.conf +++ b/tests/scripts/upstart-autologin.conf @@ -2,7 +2,7 @@ # Check emits upstart events on autologin # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf index d6214e95..1730e464 100644 --- a/tests/scripts/upstart-login.conf +++ b/tests/scripts/upstart-login.conf @@ -2,7 +2,7 @@ # Check emits upstart events on login # -[SeatDefaults] +[Seat:*] user-session=default [test-initctl-config] diff --git a/tests/scripts/user-logged-in.conf b/tests/scripts/user-logged-in.conf index 1a3a12b2..1f9a8b6b 100644 --- a/tests/scripts/user-logged-in.conf +++ b/tests/scripts/user-logged-in.conf @@ -2,7 +2,7 @@ # Check user marked as logged in # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf index c17ceddc..6d6eeada 100644 --- a/tests/scripts/user-renamed-invalid.conf +++ b/tests/scripts/user-renamed-invalid.conf @@ -2,7 +2,7 @@ # Check if PAM renames the user to one that doesn't exist lightdm handles this # -[SeatDefaults] +[Seat:*] autologin-user=change-user-invalid user-session=default diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index 38e329e9..1680fedb 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -2,7 +2,7 @@ # Check if PAM renames the user then lightdm detects this and uses the new user account # -[SeatDefaults] +[Seat:*] autologin-user=change-user1 user-session=default diff --git a/tests/scripts/user-session.conf b/tests/scripts/user-session.conf index 8d049224..59ea05a7 100644 --- a/tests/scripts/user-session.conf +++ b/tests/scripts/user-session.conf @@ -2,7 +2,7 @@ # Check get correct user session # -[SeatDefaults] +[Seat:*] user-session=default [test-greeter-config] diff --git a/tests/scripts/utmp-autologin.conf b/tests/scripts/utmp-autologin.conf index e3ae2591..5b243d95 100644 --- a/tests/scripts/utmp-autologin.conf +++ b/tests/scripts/utmp-autologin.conf @@ -5,7 +5,7 @@ [test-utmp-config] check-events=true -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/utmp-login.conf b/tests/scripts/utmp-login.conf index 24c03314..213afb15 100644 --- a/tests/scripts/utmp-login.conf +++ b/tests/scripts/utmp-login.conf @@ -5,7 +5,7 @@ [test-utmp-config] check-events=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/vnc-guest.conf b/tests/scripts/vnc-guest.conf index 820b2324..10549d93 100644 --- a/tests/scripts/vnc-guest.conf +++ b/tests/scripts/vnc-guest.conf @@ -8,7 +8,7 @@ start-default-seat=false [VNCServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index 79339973..63d951eb 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -8,7 +8,7 @@ start-default-seat=false [VNCServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index d77582c6..454e449b 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -8,7 +8,7 @@ start-default-seat=false [VNCServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index 3439aa60..c173aa39 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -2,7 +2,7 @@ # Check X authority written into home directory # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/xdg-current-desktop-legacy.conf b/tests/scripts/xdg-current-desktop-legacy.conf index 1e012884..344e7667 100644 --- a/tests/scripts/xdg-current-desktop-legacy.conf +++ b/tests/scripts/xdg-current-desktop-legacy.conf @@ -2,7 +2,7 @@ # Check XDG_CURRENT_DESKTOP is set for sessions that support it using the legacy key name # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=named-legacy diff --git a/tests/scripts/xdg-current-desktop.conf b/tests/scripts/xdg-current-desktop.conf index 00f6d8a3..c09f3dcb 100644 --- a/tests/scripts/xdg-current-desktop.conf +++ b/tests/scripts/xdg-current-desktop.conf @@ -2,7 +2,7 @@ # Check XDG_CURRENT_DESKTOP is set for sessions that support it # -[SeatDefaults] +[Seat:*] autologin-user=have-password1 user-session=named diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client.conf index e700a7c0..b24860a9 100644 --- a/tests/scripts/xdmcp-client.conf +++ b/tests/scripts/xdmcp-client.conf @@ -2,7 +2,7 @@ # Check can run a local XDMCP client # -[SeatDefaults] +[Seat:*] xdmcp-manager=127.0.0.1 #?*START-DAEMON diff --git a/tests/scripts/xdmcp-server-autologin.conf b/tests/scripts/xdmcp-server-autologin.conf index dd4308db..dd7a9502 100644 --- a/tests/scripts/xdmcp-server-autologin.conf +++ b/tests/scripts/xdmcp-server-autologin.conf @@ -8,7 +8,7 @@ start-default-seat=false [XDMCPServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default autologin-user=have-password1 diff --git a/tests/scripts/xdmcp-server-double-login.conf b/tests/scripts/xdmcp-server-double-login.conf index e64541af..552f4be7 100644 --- a/tests/scripts/xdmcp-server-double-login.conf +++ b/tests/scripts/xdmcp-server-double-login.conf @@ -8,7 +8,7 @@ start-default-seat=false [XDMCPServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/xdmcp-server-guest.conf b/tests/scripts/xdmcp-server-guest.conf index 9553a49d..1fb8869f 100644 --- a/tests/scripts/xdmcp-server-guest.conf +++ b/tests/scripts/xdmcp-server-guest.conf @@ -8,7 +8,7 @@ start-default-seat=false [XDMCPServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf index c2e25b0f..c73f855d 100644 --- a/tests/scripts/xdmcp-server-login.conf +++ b/tests/scripts/xdmcp-server-login.conf @@ -8,7 +8,7 @@ start-default-seat=false [XDMCPServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf index 670701dc..28719e7c 100644 --- a/tests/scripts/xdmcp-server-open-file-descriptors.conf +++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf @@ -8,7 +8,7 @@ start-default-seat=false [XDMCPServer] enabled=true -[SeatDefaults] +[Seat:*] user-session=default #?*START-DAEMON diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf index 922a56f9..b3b46a83 100644 --- a/tests/scripts/xserver-no-share.conf +++ b/tests/scripts/xserver-no-share.conf @@ -2,7 +2,7 @@ # Check can configure a new X server to start for the session # -[SeatDefaults] +[Seat:*] user-session=default xserver-share=false |