Set user session in tests in case LightDM was compiled with a different default

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index c7b0cd8686fa315d1a08bf5ef9faa9be3dd3bc4a..eee1d346409e270e8ccf2000dba9b1dd3bc85ad7 100644 (file)
--- 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 d19c9716937acc08abfa76fe7d3e04044ee0778b..afa34736b700af67328e2d9459db0a2b458ee876 100644 (file)
--- 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 88ca55a6622948008db492356c9dfff4d6a46d7f..c1dbd89bf93e9b7d526583713139d5f809c50a20 100644 (file)
--- 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 db9ff7773c11b201b9e58d054aeefe5899523c49..55880a9ed11256b3f45f5abb28fccb3700d8136b 100644 (file)
--- 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 9ec4f359475b1b096bc9a2a382eaf4ddffce2ced..d8aba36a3dc013a16aae4e7cb9e1887e1b225028 100644 (file)
--- 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 ba841c7c058be38419c37af0074b7731cec43ff4..50e7dd7fb80d223d77e2d0804c1e78a50d09741d 100644 (file)
--- 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 f843fc550aa6e9a889d701fdb25cd5dac1934229..1a2b92353ed9c9282dba77ff3f275c02cea036bb 100644 (file)
--- 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 0b72aacc460e1ffb2eed3ef0af44b282badd45cb..faeeb5bc41984c083a417ba32ea0df0ee5153303 100644 (file)
--- 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 356c5623704e49fc602ea3ed5ba064edb9d9aa85..61c9e1bb2b12aa23834a8dfb4870404e7ef98fc5 100644 (file)
--- 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 abb99c2e31eb44f0d9f564cf10730d5e764dfaa6..c6df7f5e6695002069dd57b2a426dc87c0395c8b 100644 (file)
--- 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 6fc243215c6e8cedda9fe14464999a718a46099d..9ed310c366e9f66eeaca9f43933c131d62827c84 100644 (file)
--- 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 10c5388c1ac0bbd7ac84231600831294c063b1ae..3d0cd0bf58614800f7e651f950ee266883868046 100644 (file)
--- 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 38eaa9ea330fce5a15c7501fa412ddc3c7f1694d..6d211a2915197c2151b5d32be8516973292c0959 100644 (file)
--- 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 fe1c245826ec9bcedb4d315e068d0c3dd124bbf6..67ca0d2a1664983eb794970a85e3760369854215 100644 (file)
--- 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 99e3bb421243f882458ceb2947d63c95ea4c8f97..a4285059da7858661c56be726479b4da63e4760e 100644 (file)
--- 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 2cd0e088355daf87f192cbd91c87dc3254c2f4d0..3860c28983e2aaf407ec85aee0bef0fa2d091df9 100644 (file)
--- 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 82873727f9e0bcf774728276aae0e412005332a3..d67b3316d718125b3159d00d6441f5961bd64175 100644 (file)
--- 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 f440bfe2e3ba7e8e12b04a605c6b2f49333af882..d073c3ebe1c5b99c83ce01bdebe354de56f473a9 100644 (file)
--- 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 cdd3254e4dba8ecf1739bf336a0517b1646edcc0..2695fb3c785a06ac3782ec1df9670ca31a245623 100644 (file)
--- 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 de3e2baa176dfa77d4b04d900381f28e95258806..a7a51dfb8404d5ec4ed83067c067221bf1bdac99 100644 (file)
--- 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 1ffc41ed90ff054ec4cb60a986e4d6f37b7ef939..9bf8f5550569e731034fdc5e11cdaebb2bb9b45f 100644 (file)
--- 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 87c2810b6533a30940ec690161dfbf2604903a68..a34e0413e4bc94efa73895c01ec66da2a12e7cf9 100644 (file)
--- 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 08d29d17bbff30b2b6af9a0ef81f7398337ae3d5..335b1a03938136ea8c645fd52baf3c452f1dcc5a 100644 (file)
--- 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 c832110bdf4a84c28a9fe9bd5bcce885794656e3..ca4bcebdc6f65a33b009fc90b01f845263c87794 100644 (file)
--- 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 0970853544d94ef7a3f7fd0cb2cee02e093938ab..e32fcf2617591895cbf960defc2dc7ca16d1698c 100644 (file)
--- 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 402ce13ac8ad3d4ecdc323c3e6152b4ef94719e5..02c8879aa2909dfeac8f3571f2debe4aec7de25d 100644 (file)
--- 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 5b50d7fac49a7cc7b4322da767f19ccd33f2c6f5..f2fc8e75e6a3640c3d65fceb7964b162d39c6c44 100644 (file)
--- 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 6baa80521e4be682d14347a11f9d0210a29c2f20..5ea74f21b251c0d34a9da32ea53321be2cafe95f 100644 (file)
--- 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 af7ce220097779bae4866d64c351ec2498127ed1..d05c71f68b94208f0cbe1954b991573ec790f5e9 100644 (file)
--- 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 ab4aa81daaebd90a57380237755fb43bffcf569a..d2950cce466fe93e3ba10a6c21a063db8cd1c954 100644 (file)
--- 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 de0e43715322e557d70975fe76c6bbee5b37129a..23cc8ef21782829a8d8fe8261512aac609ebe306 100644 (file)
--- 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 935673f98c7418d3865ff18e4a1f5d5fc99bb0c7..c74639734994d6bfcdfdc9087bc90f66835ae9fa 100644 (file)
--- 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 2c18b145d262a8a6b56a422db4488c07853809c9..24d1fc8b9662005542df2f7aff0eaa1f54185454 100644 (file)
--- 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 4b2aefbc63e6dae52081561ed47ec358c2808460..c08b9e3cb283c10bac0083150aa42cbc44271f41 100644 (file)
--- 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 f6653f5c7c1a708e9a631a8bc0c3d199fceb2a1b..eba99e16c427f95d71bd27d155df1936bffce92a 100644 (file)
--- 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 07d80c775818cdbd8a9284afa86def816f7b7187..4d427d5a4625dbaf8d60e5f8de755e5c84aa1027 100644 (file)
--- 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 8ce8c5a20fccdc6044d2e1857156c1eb4f6aaf33..23e9e8472b5eb95e7a9e62744697462921f59cde 100644 (file)
--- 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 e908c817d4b8c343a9f9c042d1de7415146f473a..9924003af8048be850f7b66d82a9acf5834c0ca6 100644 (file)
--- 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 cee5ee93a926c98d0a1570d0757a47d34902fc19..9389a84be449e8f3d25caf3ae9bf1216a9778427 100644 (file)
--- 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 35655ef3a62c2fa03d5dd9d0a8e112a8fce9f5bc..ec7ee1053f952ec02d9ef2454aeb901f89d93355 100644 (file)
--- 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 984ef3aa2d2f1bd14b9d8c1ba66dfdd410932f24..1d20c401646bfd4e39872495c71de8db250b5011 100644 (file)
--- 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 c0690774e07b71bcd6050e541c1b0c72624ab71b..5286ae0b020592c70314072161605269601a8e46 100644 (file)
--- 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 4b26e161e7e928a6227f072fbcfd7de8678bd457..3b500369799168110ed686380cee360d89a629bb 100644 (file)
--- 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 fddea59e28ea541af44ea87828988edbb5db98a2..27b922aa64b3e7ad7742fc6f5f8769b755074cc9 100644 (file)
--- 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 bf3dc97bdeff82558645230fe9a321c30a86b0e7..ddf7a5ec41d0cf3f044a4a43a7341b07003c514a 100644 (file)
--- 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 ed59e728343fbc088c2d7af7910a7f2111e18ccb..bfdb62223259930dbaa621f644c7f38199b8239e 100644 (file)
--- 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 2fe64f7541b825f8dd2615f7a84bebb1b56403db..2e04e30b3aeebfa8e6a842f7ece004bcd865c75f 100644 (file)
--- 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 83ced4d09ce56b04719c221d58fc73027830bd16..ef3c220442dd498d31e4bcf9ab481540c1a378c7 100644 (file)
--- 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 bb62c6f01860a30564c5f5e7519a9620d17879ad..6fc7867d66cab45f255b025444bb642a6c749a01 100644 (file)
--- 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 9c4fdee7603f1001dbc282de5ae42742a7ae5a92..50c0ca004db33a5a7341fe8a21c55098a80a8223 100644 (file)
--- 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 4ae3e11f9ba024378125a0648d36ae997e0e2b3e..4ea98315a07bbcfecce8c3f0a33b52d91a89e637 100644 (file)
--- 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 be0fae114914951fd9bc1a05b092ce7d7c3e5cf3..e431d6cf0d2820bd410a412968cdd8a212ca3165 100644 (file)
--- 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 e5f0befc7228f0e7170511f3b16bb0ad63634171..d607d0b1a5b525aed1e578cd4eda3216d7510479 100644 (file)
--- 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 0670ce14363185127093e2cdafd38838e07c90c6..2c3a69388c0852c553512f93019890abe12b96a0 100644 (file)
--- 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 47cc3ebcab61a1334701e884a66f661880a8e937..93736ad6e98d04d679e237711f1e0ce23fdfd487 100644 (file)
--- 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 e221bc6066c3cef8cd8b86b0599d78f014dfcbec..494a557f7f0adbffbd6eed9e4f981d03cb9d6249 100644 (file)
--- 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 efe23de6a64d9b2a44a403d50ff1e1852a7178d5..9d311dd9e5bd9b7e1b7ad9cff2eacd5186f62ff6 100644 (file)
--- 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 0e196089e02d64fc31993931d2b8f82207a5f1cd..33cf80d9dbc45f70efc1119323ab42267490d617 100644 (file)
--- 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 84ee35740a11e3e85ab17884c7db85cc83ab3f0e..dd15be7d7da59ef7b1eeb3b732b1a58528052d80 100644 (file)
--- 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 0b195a30d349fdf3a7a3c050aeadc374f65b21a5..fa1af66aec0aab806194a3d22c6080985fe4a434 100644 (file)
--- 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 364406473c122b72f5cc22bb88fd01f7d8608452..b47e052c59dec4813b13eeaebf9ef3e4d4072e02 100644 (file)
--- 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 622d64d903160616b952ea0436b6f8ac89735024..57d74832e0993192835c4c63be1c218ab9d9a30d 100644 (file)
--- 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 790cde14d176eedfbde7be251106c4d249bfbfd3..e775857996410d55f1ea34f4199c91859cd56f3d 100644 (file)
--- 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 a0d05f073823ff284253fa843b625bc86231c46f..e6d54a45a8526595e955b025672e92fcf6178b64 100644 (file)
--- 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 3b82de769a7fb92acde038b8a2b332d30fd77102..ad2fccf8824d20a0085f1f61d57d2e7a0832453a 100644 (file)
--- 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 77806edec5d23c5106547829194a85af8fe6c248..4e245b3ed8a35e2abd77275f4681addac6284ec7 100644 (file)
--- 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 d64f5f685ab140dcb705f9b81d61e53fc2c8609b..b08f527676671b9d7e60b13175d6d333656e86e5 100644 (file)
--- 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);