diff options
67 files changed, 98 insertions, 0 deletions
diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index c7b0cd86..eee1d346 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -8,6 +8,7 @@ disable-guest-wrapper=true [SeatDefaults] autologin-guest=true autologin-in-background=true +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index d19c9716..afa34736 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -7,6 +7,7 @@ disable-guest-wrapper=true [SeatDefaults] autologin-guest=true +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index 88ca55a6..c1dbd89b 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -8,6 +8,7 @@ disable-guest-wrapper=true [SeatDefaults] autologin-guest=true autologin-user-timeout=1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index db9ff777..55880a9e 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -7,6 +7,7 @@ disable-guest-wrapper=true [SeatDefaults] autologin-guest=true +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index 9ec4f359..d8aba36a 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -5,6 +5,7 @@ [SeatDefaults] autologin-user=have-password1 autologin-in-background=true +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index ba841c7c..50e7dd7f 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index f843fc55..1a2b9235 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index 0b72aacc..faeeb5bc 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=session-error +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 356c5623..61c9e1bb 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -6,6 +6,7 @@ autologin-user=have-password1 autologin-user-timeout=1 autologin-in-background=true +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index abb99c2e..c6df7f5e 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -5,6 +5,7 @@ [SeatDefaults] autologin-user=have-password1 autologin-user-timeout=1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 6fc24321..9ed310c3 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 10c5388c..3d0cd0bf 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 38eaa9ea..6d211a29 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -7,6 +7,7 @@ disable-login1=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index fe1c2458..67ca0d2a 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=cred-error +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index 99e3bb42..a4285059 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=cred-expired +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 2cd0e088..3860c289 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=cred-unavail +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index 82873727..d67b3316 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=group-member +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index f440bfe2..d073c3eb 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=mount-home-dir +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index cdd3254e..2695fb3c 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=make-home-dir +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index de3e2baa..a7a51dfb 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index 1ffc41ed..9bf8f555 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 87c2810b..a34e0413 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=no-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 08d29d17..335b1a03 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index c832110b..ca4bcebd 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index 09708535..e32fcf26 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -5,6 +5,9 @@ [LightDM] disable-guest-wrapper=true +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 402ce13a..02c8879a 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -5,6 +5,9 @@ [LightDM] disable-guest-wrapper=true +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index 5b50d7fa..f2fc8e75 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -2,6 +2,9 @@ # Check logging out returns to the greeter # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 6baa8052..5ea74f21 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -2,6 +2,9 @@ # Check can login without a username, and is prompted for one # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index af7ce220..d05c71f6 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -2,6 +2,9 @@ # Check prompted to change password # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index ab4aa81d..d2950cce 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -2,6 +2,9 @@ # Check can login without password for accounts that do not have a password # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index de0e4371..23cc8ef2 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -2,6 +2,9 @@ # Check we handle conversations during each PAM method # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index 935673f9..c7463973 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -2,6 +2,9 @@ # Check if session crashes then returned to greeter # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index 2c18b145..24d1fc8b 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -2,6 +2,9 @@ # Check LightDM returns to the greeter if the X server crashes inside a session # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # XServer starts diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index 4b2aefbc..c08b9e3c 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -2,6 +2,9 @@ # Check can login # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index f6653f5c..eba99e16 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -7,6 +7,7 @@ disable-accounts-service=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index 07d80c77..4d427d5a 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -8,6 +8,7 @@ disable-login1=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index 8ce8c5a2..23e9e847 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -7,6 +7,7 @@ disable-console-kit=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index e908c817..9924003a 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -7,6 +7,7 @@ disable-login1=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index cee5ee93..9389a84b 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -3,6 +3,9 @@ # Use a greeter so its file descriptors are around at the time the session starts. # +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START # X server starts diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index 35655ef3..ec7ee105 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=log-pam +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 984ef3aa..1d20c401 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -8,6 +8,7 @@ greeter-setup-script=test-script-hook GREETER-SETUP session-setup-script=test-script-hook SESSION-SETUP session-cleanup-script=test-script-hook SESSION-CLEANUP autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index c0690774..5286ae0b 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=no-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index 4b26e161..3b500369 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index fddea59e..27b922aa 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index bf3dc97b..ddf7a5ec 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf index ed59e728..bfdb6222 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter-new-session-logout-old.conf b/tests/scripts/switch-to-greeter-new-session-logout-old.conf index 2fe64f75..2e04e30b 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 83ced4d0..ef3c2204 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index bb62c6f0..6fc7867d 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 9c4fdee7..50c0ca00 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index 4ae3e11f..4ea98315 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index be0fae11..e431d6cf 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -7,6 +7,7 @@ disable-guest-wrapper=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf index e5f0befc..d607d0b1 100644 --- a/tests/scripts/switch-to-user-existing-session.conf +++ b/tests/scripts/switch-to-user-existing-session.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf index 0670ce14..2c3a6938 100644 --- a/tests/scripts/switch-to-user-logout.conf +++ b/tests/scripts/switch-to-user-logout.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index 47cc3ebc..93736ad6 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index e221bc60..494a557f 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=no-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index efe23de6..9d311dd9 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 0e196089..33cf80d9 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -7,6 +7,7 @@ user-authority-in-system-dir=true [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index 84ee3574..dd15be7d 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=change-user1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf index 0b195a30..fa1af66a 100644 --- a/tests/scripts/util-path.conf +++ b/tests/scripts/util-path.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index 36440647..b47e052c 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -9,6 +9,9 @@ start-default-seat=false enabled=true port=9999 +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index 622d64d9..57d74832 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -9,6 +9,9 @@ start-default-seat=false enabled=true port=9999 +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index 790cde14..e7758579 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -4,6 +4,7 @@ [SeatDefaults] autologin-user=have-password1 +user-session=default #?RUNNER DAEMON-START diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf index a0d05f07..e6d54a45 100644 --- a/tests/scripts/xdmcp-login.conf +++ b/tests/scripts/xdmcp-login.conf @@ -9,6 +9,9 @@ start-default-seat=false enabled=true port=9999 +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/scripts/xdmcp-open-file-descriptors.conf b/tests/scripts/xdmcp-open-file-descriptors.conf index 3b82de76..ad2fccf8 100644 --- a/tests/scripts/xdmcp-open-file-descriptors.conf +++ b/tests/scripts/xdmcp-open-file-descriptors.conf @@ -9,6 +9,9 @@ start-default-seat=false enabled=true port=9999 +[SeatDefaults] +user-session=default + #?RUNNER DAEMON-START #?*WAIT diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index 77806ede..4e245b3e 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -157,6 +157,8 @@ redirect_path (const gchar *path) return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "etc", "lightdm", "lightdm.conf", NULL); else if (g_str_has_prefix (path, "/tmp/")) return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", path + 5, NULL); + else if (g_str_has_prefix (path, "/var/")) + return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "var", path + 5, NULL); else return g_strdup (path); } diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index d64f5f68..b08f5276 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -1689,6 +1689,7 @@ main (int argc, char **argv) g_mkdir_with_parents (g_strdup_printf ("%s/etc", temp_dir), 0755); g_mkdir_with_parents (g_strdup_printf ("%s/usr/share", temp_dir), 0755); g_mkdir_with_parents (g_strdup_printf ("%s/tmp", temp_dir), 0755); + g_mkdir_with_parents (g_strdup_printf ("%s/var/run/lightdm", temp_dir), 0755); /* Copy over the configuration */ g_mkdir_with_parents (g_strdup_printf ("%s/etc/lightdm", temp_dir), 0755); |