summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-07-21 20:38:43 +1200
committerRobert Ancell <robert.ancell@canonical.com>2013-07-21 20:38:43 +1200
commit0c7cb978da8299cf27482817cef07697494628ce (patch)
tree97f8f4626610e8042b891e80e660493d2c079944
parent76e525706d4c352e2464522ee7c00eb46a7873d9 (diff)
downloadlightdm-0c7cb978da8299cf27482817cef07697494628ce.tar.gz
Set user-session in tests that haven't got it set
-rw-r--r--tests/scripts/autologin-guest-fail-setup-script.conf1
-rw-r--r--tests/scripts/autologin-new-authtok.conf1
-rw-r--r--tests/scripts/autologin-password.conf1
-rw-r--r--tests/scripts/crash-authenticate.conf1
-rw-r--r--tests/scripts/denied.conf1
-rw-r--r--tests/scripts/expired.conf1
-rw-r--r--tests/scripts/login-guest-fail-setup-script.conf3
-rw-r--r--tests/scripts/script-hook-fail-session-setup.conf1
-rw-r--r--tests/scripts/user-renamed-invalid.conf1
9 files changed, 11 insertions, 0 deletions
diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index a9b51fec..e572c427 100644
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -7,6 +7,7 @@ guest-account-script=false
[SeatDefaults]
autologin-guest=true
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
index c9b0e6c2..4dca98ec 100644
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=new-authtok
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index 4d5f020c..52419818 100644
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=always-password
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index 3976def3..b6a94e1c 100644
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=crash-authenticate
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index 97c0a6c0..65d47ac0 100644
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=denied
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index f79a2190..1fa029f0 100644
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=expired
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index 1558c4e9..3bdcb6b0 100644
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -5,6 +5,9 @@
[LightDM]
guest-account-script=false
+[SeatDefaults]
+user-session=default
+
#?RUNNER DAEMON-START
# X server starts
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
index f222c0e2..ecc3446c 100644
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -5,6 +5,7 @@
[SeatDefaults]
session-setup-script=test-script-hook SESSION-SETUP 1
autologin-user=have-password1
+user-session=default
#?RUNNER DAEMON-START
diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index 4d3878fc..f8091b75 100644
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -4,6 +4,7 @@
[SeatDefaults]
autologin-user=change-user-invalid
+user-session=default
#?RUNNER DAEMON-START