Make tests work without installing.

Approved by PS Jenkins bot, Robert Ancell.

diff --git a/data/lightdm.conf b/data/lightdm.conf
index b8b3f56079502b01be904a47fc67a4f25c2e6ca3..6fcc86db2b8601841ddf8426f7b388989b75760f 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -14,6 +14,7 @@
 # xsessions-directory = Directory to find X sessions
 # remote-sessions-directory = Directory to find remote sessions
 # xgreeters-directory = Directory to find X greeters
+# disable-guest-wrapper = Disable using guest session wrapper (temporary? required to make tests work without installing)
 #
 [LightDM]
 #start-default-seat=true
@@ -29,6 +30,7 @@
 #xsessions-directory=/usr/share/xsessions
 #remote-sessions-directory=/usr/share/lightdm/remote-sessions
 #xgreeters-directory=/usr/share/xgreeters
+#disable-guest-wrapper=false
 
 #
 # Seat defaults

diff --git a/src/display.c b/src/display.c
index c935571ffd1fcddc68a3fa55cff15b4ffed2ec8b..5ba1ebe6bb79a093ee67eccfcbc3c8bc84823889 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -704,6 +704,7 @@ display_start_session (Display *display)
     gchar *filename, *sessions_dir, *path;
     const gchar *language;
     gchar **argv;
+    gboolean disable_guest_wrapper;
 
     user = session_get_user (display->priv->session);
 
@@ -738,7 +739,8 @@ display_start_session (Display *display)
     session_set_env (display->priv->session, "GDMSESSION", display->priv->user_session); // FIXME: Not cross-desktop
 
     /* Run a guest session through the wrapper covered by MAC */
-    if (display->priv->autologin_guest)
+    disable_guest_wrapper = config_get_boolean (config_get_instance (), "LightDM", "disable-guest-wrapper");
+    if (display->priv->autologin_guest && !disable_guest_wrapper)
     {
         gchar *wrapper = g_build_filename (PKGLIBEXEC_DIR, "lightdm-guest-session-wrapper", NULL);
         g_debug ("Running guest session through wrapper: %s", wrapper);

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 6048a03bf03767c8c07616945b1f369ad6b0bdc0..c7b0cd8686fa315d1a08bf5ef9faa9be3dd3bc4a 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in guest while keeping a greeter up
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 [SeatDefaults]
 autologin-guest=true
 autologin-in-background=true

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 2f643185fc4d9f31d640ae4ab457e7768510fdc9..d19c9716937acc08abfa76fe7d3e04044ee0778b 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 [SeatDefaults]
 autologin-guest=true
 

diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
index 1d449618e9a5911d91c3c9eee4bccf17fffd3367..88ca55a6622948008db492356c9dfff4d6a46d7f 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 [SeatDefaults]
 autologin-guest=true
 autologin-user-timeout=1

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index 0095af55d68b2ea663a390bd91ff66c12a1e11ac..db9ff7773c11b201b9e58d054aeefe5899523c49 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 [SeatDefaults]
 autologin-guest=true
 

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 4be924802000527ed7374ca548e5c5cda8e0a66e..0970853544d94ef7a3f7fd0cb2cee02e093938ab 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 #?RUNNER DAEMON-START
 
 # X server starts

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 020ddcaf40eb29fddbdd2ce407ae9241d5b17d40..402ce13ac8ad3d4ecdc323c3e6152b4ef94719e5 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -2,6 +2,9 @@
 # Check can login as guest (not prompted for password)
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 #?RUNNER DAEMON-START
 
 # X server starts

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index 4a3a899c98a8a8ce11db77a83f1618836d3165f5..be0fae114914951fd9bc1a05b092ce7d7c3e5cf3 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -2,6 +2,9 @@
 # Check D-Bus interface can trigger/switch to guest session
 #
 
+[LightDM]
+disable-guest-wrapper=true
+
 [SeatDefaults]
 autologin-user=have-password1