diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-10-04 00:03:41 +0000 |
|---|---|---|
| committer | Tarmac <> | 2013-10-04 00:03:41 +0000 |
| commit | 721259cd2e1905f8a1c53952a9f6dd7c8a631604 (patch) | |
| tree | 384a974f507e2791ec9a56aa0ce787cc3743ba04 | |
| parent | 075e3efb0ec223de5cc836e9e9b225de244ecb98 (diff) | |
| parent | 5f0a5326ea85f5848ce9155ec0d8d61831250ece (diff) | |
| download | lightdm-git-721259cd2e1905f8a1c53952a9f6dd7c8a631604.tar.gz | |
Set session environment variables for guest sessions. Fixes: https://bugs.launchpad.net/bugs/1214504.
Approved by Robert Ancell, PS Jenkins bot.
98 files changed, 146 insertions, 193 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 19fa06a9..527d465a 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -2,10 +2,10 @@ Description: Adjustments due to handling of languages Forwarded: not-needed Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> -Index: trunk/liblightdm-gobject/language.c +Index: guest-desktop-session/liblightdm-gobject/language.c =================================================================== ---- trunk.orig/liblightdm-gobject/language.c 2013-09-25 12:08:11.120803355 +1200 -+++ trunk/liblightdm-gobject/language.c 2013-09-25 12:08:11.112803355 +1200 +--- guest-desktop-session.orig/liblightdm-gobject/language.c 2013-10-04 12:01:29.437363620 +1300 ++++ guest-desktop-session/liblightdm-gobject/language.c 2013-10-04 12:01:29.433363621 +1300 @@ -40,7 +40,7 @@ static void update_languages (void) @@ -15,10 +15,10 @@ Index: trunk/liblightdm-gobject/language.c gchar *stdout_text = NULL, *stderr_text = NULL; gint exit_status; gboolean result; -Index: trunk/tests/scripts/language-env.conf +Index: guest-desktop-session/tests/scripts/language-env.conf =================================================================== ---- trunk.orig/tests/scripts/language-env.conf 2013-09-25 12:08:11.120803355 +1200 -+++ trunk/tests/scripts/language-env.conf 2013-09-25 12:08:11.112803355 +1200 +--- guest-desktop-session.orig/tests/scripts/language-env.conf 2013-10-04 12:01:29.437363620 +1300 ++++ guest-desktop-session/tests/scripts/language-env.conf 2013-10-04 12:01:29.433363621 +1300 @@ -22,8 +22,8 @@ #?SESSION-X-0 CONNECT-XSERVER @@ -30,20 +30,11 @@ Index: trunk/tests/scripts/language-env.conf #?*SESSION-X-0 READ-ENV NAME=GDM_LANG #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU -Index: trunk/src/seat.c +Index: guest-desktop-session/src/seat.c =================================================================== ---- trunk.orig/src/seat.c 2013-09-25 12:08:11.120803355 +1200 -+++ trunk/src/seat.c 2013-09-25 12:08:11.112803355 +1200 -@@ -849,7 +849,7 @@ - session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); - if (language && language[0] != '\0') - { -- session_set_env (session, "LANG", language); -+ session_set_env (session, "LANGUAGE", language); - session_set_env (session, "GDM_LANG", language); - } - session_set_username (session, username); -@@ -1008,7 +1008,7 @@ +--- guest-desktop-session.orig/src/seat.c 2013-10-04 12:01:29.437363620 +1300 ++++ guest-desktop-session/src/seat.c 2013-10-04 12:01:29.433363621 +1300 +@@ -822,7 +822,7 @@ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); if (language && language[0] != '\0') { @@ -51,4 +42,4 @@ Index: trunk/src/seat.c + session_set_env (session, "LANGUAGE", language); session_set_env (session, "GDM_LANG", language); } - + } @@ -809,6 +809,24 @@ find_session_config (Seat *seat, const gchar *sessions_dir, const gchar *session return session_config; } +static void +configure_session (Session *session, SessionConfig *config, const gchar *session_name, const gchar *language) +{ + const gchar *desktop_name; + + session_set_session_type (session, session_config_get_session_type (config)); + session_set_env (session, "DESKTOP_SESSION", session_name); + session_set_env (session, "GDMSESSION", session_name); + desktop_name = session_config_get_desktop_name (config); + if (desktop_name) + session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); + if (language && language[0] != '\0') + { + session_set_env (session, "LANG", language); + session_set_env (session, "GDM_LANG", language); + } +} + static Session * create_user_session (Seat *seat, const gchar *username, gboolean autostart) { @@ -837,27 +855,15 @@ create_user_session (Seat *seat, const gchar *username, gboolean autostart) g_free (sessions_dir); if (session_config) { - const gchar *desktop_name; gchar **argv; session = create_session (seat, autostart); - session_set_session_type (session, session_config_get_session_type (session_config)); - session_set_env (session, "DESKTOP_SESSION", session_name); - session_set_env (session, "GDMSESSION", session_name); - desktop_name = session_config_get_desktop_name (session_config); - if (desktop_name) - session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); - if (language && language[0] != '\0') - { - session_set_env (session, "LANG", language); - session_set_env (session, "GDM_LANG", language); - } + configure_session (session, session_config, session_name, language); session_set_username (session, username); session_set_do_authenticate (session, TRUE); argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); session_set_argv (session, argv); g_strfreev (argv); - g_object_unref (session_config); } else @@ -871,12 +877,14 @@ create_user_session (Seat *seat, const gchar *username, gboolean autostart) static Session * create_guest_session (Seat *seat) { + const gchar *session_name; gchar *sessions_dir, **argv; SessionConfig *session_config; Session *session; + session_name = seat_get_string_property (seat, "user-session"); sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); - session_config = find_session_config (seat, sessions_dir, seat_get_string_property (seat, "user-session")); + session_config = find_session_config (seat, sessions_dir, session_name); g_free (sessions_dir); if (!session_config) { @@ -885,13 +893,13 @@ create_guest_session (Seat *seat) } session = create_session (seat, TRUE); - session_set_session_type (session, session_config_get_session_type (session_config)); + configure_session (session, session_config, session_name, NULL); session_set_do_authenticate (session, TRUE); session_set_is_guest (session, TRUE); argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); - g_object_unref (session_config); session_set_argv (session, argv); g_strfreev (argv); + g_object_unref (session_config); return session; } @@ -929,7 +937,7 @@ static gboolean greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat) { Session *session, *existing_session; - const gchar *username, *desktop_name, *language = NULL; + const gchar *username, *language = NULL; SessionConfig *session_config; User *user; gchar *sessions_dir = NULL; @@ -997,21 +1005,10 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi return FALSE; } - session_set_session_type (session, session_config_get_session_type (session_config)); + configure_session (session, session_config, session_name, language); argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); session_set_argv (session, argv); g_strfreev (argv); - session_set_env (session, "DESKTOP_SESSION", session_name); - session_set_env (session, "GDMSESSION", session_name); - desktop_name = session_config_get_desktop_name (session_config); - if (desktop_name) - session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); - if (language && language[0] != '\0') - { - session_set_env (session, "LANG", language); - session_set_env (session, "GDM_LANG", language); - } - g_object_unref (session_config); /* If can re-use the display server, stop the greeter first */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 99c97b05..7c5a4cdf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,7 +47,6 @@ TESTS = \ test-autologin-guest-fail-setup-script \ test-autologin-guest-logout \ test-group-membership \ - test-session-env \ test-xdg-current-desktop \ test-xdg-seat \ test-language-env \ @@ -395,7 +394,6 @@ EXTRA_DIST = \ scripts/script-hook-fail-display-setup.conf \ scripts/script-hook-fail-greeter-setup.conf \ scripts/script-hook-fail-session-setup.conf \ - scripts/session-env.conf \ scripts/session-stdout.conf \ scripts/session-stderr.conf \ scripts/session-stderr-multi-write.conf \ diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf index 40ceded9..cb5751cc 100644 --- a/tests/scripts/additional-config-priority.conf +++ b/tests/scripts/additional-config-priority.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index 53a02254..bb54dcae 100644 --- a/tests/scripts/additional-config.conf +++ b/tests/scripts/additional-config.conf @@ -19,7 +19,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/additional-system-config-priority.conf b/tests/scripts/additional-system-config-priority.conf index 1ed1bcba..9a4da16b 100644 --- a/tests/scripts/additional-system-config-priority.conf +++ b/tests/scripts/additional-system-config-priority.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/additional-system-config.conf b/tests/scripts/additional-system-config.conf index 5f170c66..510bfd9b 100644 --- a/tests/scripts/additional-system-config.conf +++ b/tests/scripts/additional-system-config.conf @@ -19,7 +19,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index 7323bd98..5ab0dec5 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -29,7 +29,7 @@ user-session=default #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?GUEST-ACCOUNT ADD USERNAME=guest-.* -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=guest-.* +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index 0a532dc0..6db13081 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -23,7 +23,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index 4a6af9a6..b840419d 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -40,7 +40,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index a203d8b4..b57325e2 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -23,7 +23,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index d63cee0f..59beb6d4 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -25,7 +25,7 @@ user-session=default #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=have-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index ad97f670..38c9e460 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Autologin session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 0851ca42..7d3f6e99 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -16,7 +16,7 @@ autologin-user=have-session #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=have-session +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=have-session #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 57bdb5b8..8cb38ac4 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 43f1cb99..145a6bd8 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -26,7 +26,7 @@ user-session=default #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=have-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 8c5463ff..b233a490 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -34,7 +34,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 5e7730c0..c5367316 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 1d3e912e..258d80e9 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 818d621a..985386cf 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf index 38cc52f4..bc33db76 100644 --- a/tests/scripts/dbus.conf +++ b/tests/scripts/dbus.conf @@ -36,7 +36,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index 0b2e218d..5dcbb519 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=group-member +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=group-member #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index 56d93942..bee18b78 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=mount-home-dir +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=mount-home-dir #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index c1d22e0a..d93440fd 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=make-home-dir +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=make-home-dir #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf index 6fbd2cab..e0cf7d1b 100644 --- a/tests/scripts/language-env.conf +++ b/tests/scripts/language-env.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-language +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-language #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf index 2abe49b4..08b4af6c 100644 --- a/tests/scripts/lock-seat-console-kit.conf +++ b/tests/scripts/lock-seat-console-kit.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf index f7032cc5..58cba918 100644 --- a/tests/scripts/lock-seat-return-session-console-kit.conf +++ b/tests/scripts/lock-seat-return-session-console-kit.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index 9a6ad338..94b34293 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index b0ea9883..88f7a727 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 4fad1abe..7b4c70fb 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 4c17fe48..68e79c49 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index 6a52cb06..2a8d1558 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index 404ec1d3..1b1a2697 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -35,7 +35,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 1d72f3f0..112ad103 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -35,7 +35,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index c88233f8..94c90dd2 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -31,7 +31,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index ca39bde9..b4c1fc24 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -28,7 +28,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=have-session +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=have-session #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index e6424b11..abd6738b 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -33,7 +33,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index b747ddda..24936df5 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -31,7 +31,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=new-authtok +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=new-authtok #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index 0c023122..ab90dd28 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -29,7 +29,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 4b31ecaf..2b627f4c 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -33,7 +33,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=log-pam +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=log-pam #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index c9e6d8de..ca20ed56 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -26,7 +26,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index f567a04c..f5eef9f9 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -26,7 +26,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=have-session +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=have-session #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf index 097c00d1..2152c586 100644 --- a/tests/scripts/login-remember-session.conf +++ b/tests/scripts/login-remember-session.conf @@ -26,7 +26,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -58,7 +58,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 NAME=alternative USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf index c3ab9aab..40ca7dcb 100644 --- a/tests/scripts/login-remote-session.conf +++ b/tests/scripts/login-remote-session.conf @@ -35,7 +35,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=guest-.* +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=test-remote USER=guest-.* #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index a1793d62..b0e5386d 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -31,7 +31,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index 7ec72f5b..37d5b409 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -31,7 +31,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index cb0eede8..1df16785 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -31,7 +31,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index b3f92952..e3b2e454 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index 2fb77a86..53173441 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index 0b351b64..895b1bd0 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index ab30b02a..de07f940 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index 027d44ac..065f4641 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -32,7 +32,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index c99e98c4..cbddad40 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=log-pam +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=log-pam #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index be4cab0e..0a3069e5 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -25,7 +25,7 @@ user-session=default #?SCRIPT-HOOK SESSION-SETUP # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-env.conf b/tests/scripts/session-env.conf deleted file mode 100644 index 651b7e06..00000000 --- a/tests/scripts/session-env.conf +++ /dev/null @@ -1,34 +0,0 @@ -# -# Check logind variables are set in session -# - -[SeatDefaults] -autologin-user=have-password1 -user-session=default - -#?RUNNER DAEMON-START - -# X server starts -#?XSERVER-0 START VT=7 - -# Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT - -# Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 -#?XSERVER-0 ACCEPT-CONNECT -#?SESSION-X-0 CONNECT-XSERVER - -# Check environment variables -#?*SESSION-X-0 READ-ENV NAME=DESKTOP_SESSION -#?SESSION-X-0 READ-ENV NAME=DESKTOP_SESSION VALUE=default -#?*SESSION-X-0 READ-ENV NAME=GDMSESSION -#?SESSION-X-0 READ-ENV NAME=GDMSESSION VALUE=default - -# Cleanup -#?*STOP-DAEMON -#?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 -#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index 5e9a0d9c..557337cf 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -42,7 +42,7 @@ user-session=default #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE #?*GREETER-X-0 START-SESSION #?GREETER-X-0 TERMINATE SIGNAL=15 -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -71,7 +71,7 @@ user-session=default #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE #?*GREETER-X-0 START-SESSION #?GREETER-X-0 TERMINATE SIGNAL=15 -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index 0b11d92d..7b2ac36d 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 97ed4ca2..e2c311ef 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index 37da1b98..a03ef958 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/surfaceflinger-autologin.conf b/tests/scripts/surfaceflinger-autologin.conf index 487742a7..f2b3dbcc 100644 --- a/tests/scripts/surfaceflinger-autologin.conf +++ b/tests/scripts/surfaceflinger-autologin.conf @@ -10,7 +10,7 @@ user-session=surfaceflinger #?RUNNER DAEMON-START # Session starts (test session doesn't know it's in surfaceflinger) -#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 USER=have-password1 +#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 DESKTOP_SESSION=surfaceflinger USER=have-password1 # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 1080954a..9f3a9d63 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -55,7 +55,7 @@ user-session=default #?GREETER-X-1 TERMINATE SIGNAL=15 # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=have-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index 4102ec10..304ba15e 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 20ca573a..52df4248 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index a6510cc6..e84a5129 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index d8c2813b..79902b88 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Default session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -47,7 +47,7 @@ user-session=default #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=guest-.* +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=guest-.* #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf index 1c3eb098..7c677762 100644 --- a/tests/scripts/switch-to-user-active.conf +++ b/tests/scripts/switch-to-user-active.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-existing-no-password.conf b/tests/scripts/switch-to-user-existing-no-password.conf index 30556589..46bcca4e 100644 --- a/tests/scripts/switch-to-user-existing-no-password.conf +++ b/tests/scripts/switch-to-user-existing-no-password.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,7 +38,7 @@ user-session=default #?LOGIN1 LOCK-SESSION # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf index 4b6c8f5a..74dbc147 100644 --- a/tests/scripts/switch-to-user-existing.conf +++ b/tests/scripts/switch-to-user-existing.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,7 +38,7 @@ user-session=default #?LOGIN1 LOCK-SESSION # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf index ded4a31f..825d316c 100644 --- a/tests/scripts/switch-to-user-logout-active.conf +++ b/tests/scripts/switch-to-user-logout-active.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,7 +38,7 @@ user-session=default #?LOGIN1 LOCK-SESSION # Session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-logout-inactive.conf b/tests/scripts/switch-to-user-logout-inactive.conf index a5016331..1b9fad01 100644 --- a/tests/scripts/switch-to-user-logout-inactive.conf +++ b/tests/scripts/switch-to-user-logout-inactive.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,7 +38,7 @@ user-session=default #?LOGIN1 LOCK-SESSION # Session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index cfee1bf9..96a9dc19 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -41,7 +41,7 @@ user-session=default #?VT ACTIVATE VT=8 # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index 539111b3..a2d3c4e4 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index 6938ea58..a4d47d74 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -18,7 +18,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -41,7 +41,7 @@ user-session=default #?VT ACTIVATE VT=8 # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=no-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER @@ -64,7 +64,7 @@ user-session=default #?LOGIN1 LOCK-SESSION # New session starts -#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 USER=no-password2 +#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 DESKTOP_SESSION=default USER=no-password2 #?XSERVER-2 ACCEPT-CONNECT #?SESSION-X-2 CONNECT-XSERVER diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 0389c52a..40e5a3cc 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -20,7 +20,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index 7882e8a8..421d9e58 100644 --- a/tests/scripts/unity-autologin.conf +++ b/tests/scripts/unity-autologin.conf @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf index d3771db6..d1f3f914 100644 --- a/tests/scripts/unity-compositor-next-session.conf +++ b/tests/scripts/unity-compositor-next-session.conf @@ -30,7 +30,7 @@ autologin-in-background=true #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index c27f70a0..1e2b14d6 100644 --- a/tests/scripts/unity-login.conf +++ b/tests/scripts/unity-login.conf @@ -39,7 +39,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf index 61914365..0d59bda5 100644 --- a/tests/scripts/unity-mir-autologin.conf +++ b/tests/scripts/unity-mir-autologin.conf @@ -14,7 +14,7 @@ user-session=mir #?*UNITY-SYSTEM-COMPOSITOR READY # Session starts -#?SESSION-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password1 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0 diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf index a9935d99..608ca078 100644 --- a/tests/scripts/unity-mir-greeter-mir-session.conf +++ b/tests/scripts/unity-mir-greeter-mir-session.conf @@ -26,7 +26,7 @@ user-session=mir #?*GREETER-MIR-0 START-SESSION # Session starts -#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1 diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf index 8824b006..2edb7135 100644 --- a/tests/scripts/unity-mir-greeter-x-session.conf +++ b/tests/scripts/unity-mir-greeter-x-session.conf @@ -34,7 +34,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf index 07bafa9b..3fe743ae 100644 --- a/tests/scripts/unity-mir-session-x-greeter.conf +++ b/tests/scripts/unity-mir-session-x-greeter.conf @@ -36,7 +36,7 @@ user-session=mir #?*GREETER-X-0 START-SESSION # Session starts -#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 USER=no-password1 +#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1 diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf index d32e51de..6ceeefa1 100644 --- a/tests/scripts/unity-plymouth.conf +++ b/tests/scripts/unity-plymouth.conf @@ -32,7 +32,7 @@ active=true #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index 80210fe2..7bd8981d 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -63,7 +63,7 @@ user-session=default #?GREETER-X-1 TERMINATE SIGNAL=15 # New session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password2 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf index 4b02371a..c76923de 100644 --- a/tests/scripts/unity-xdg-seat.conf +++ b/tests/scripts/unity-xdg-seat.conf @@ -23,7 +23,7 @@ xdg-seat=seat1 #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf index 853b3918..b396aed8 100644 --- a/tests/scripts/upstart-autologin.conf +++ b/tests/scripts/upstart-autologin.conf @@ -23,7 +23,7 @@ report-events=true #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf index c4473238..bffc1f06 100644 --- a/tests/scripts/upstart-login.conf +++ b/tests/scripts/upstart-login.conf @@ -38,7 +38,7 @@ report-events=true #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index c1a57e18..d9908ee2 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=change-user2 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=change-user2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf index 66fabe53..fe21ed83 100644 --- a/tests/scripts/util-path.conf +++ b/tests/scripts/util-path.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index f16c9d83..d3b0ee13 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -51,7 +51,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START USER=have-password1 +#?SESSION-X-0 START DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index 97bfa1b7..937ba913 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -50,7 +50,7 @@ user-session=default #?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-0 START USER=have-password1 +#?SESSION-X-0 START DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index a15e4546..da13954a 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -17,7 +17,7 @@ user-session=default #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xdg-current-desktop.conf b/tests/scripts/xdg-current-desktop.conf index 2eae1a68..17162ed9 100644 --- a/tests/scripts/xdg-current-desktop.conf +++ b/tests/scripts/xdg-current-desktop.conf @@ -17,7 +17,7 @@ user-session=named #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop DESKTOP_SESSION=named USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xdg-seat.conf b/tests/scripts/xdg-seat.conf index 15d9c1a3..45a7a7f5 100644 --- a/tests/scripts/xdg-seat.conf +++ b/tests/scripts/xdg-seat.conf @@ -18,7 +18,7 @@ xdg-seat=seat1 #?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 USER=have-password1 +#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf index c6543d57..c2e38df5 100644 --- a/tests/scripts/xdmcp-server-login.conf +++ b/tests/scripts/xdmcp-server-login.conf @@ -48,7 +48,7 @@ user-session=default #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-127.0.0.1:98 START USER=have-password1 +#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf index 544c4107..9dac617f 100644 --- a/tests/scripts/xdmcp-server-open-file-descriptors.conf +++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf @@ -48,7 +48,7 @@ user-session=default #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION-X-127.0.0.1:98 START USER=have-password1 +#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf index fac3e973..e18e1dcd 100644 --- a/tests/scripts/xserver-no-share.conf +++ b/tests/scripts/xserver-no-share.conf @@ -39,7 +39,7 @@ xserver-share=false #?XSERVER-1 ACCEPT-CONNECT # Session starts -#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 USER=have-password1 +#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 DESKTOP_SESSION=default USER=have-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/src/test-session.c b/tests/src/test-session.c index 5e731d7c..14ce0146 100644 --- a/tests/src/test-session.c +++ b/tests/src/test-session.c @@ -202,7 +202,7 @@ request_cb (const gchar *request) int main (int argc, char **argv) { - gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *mir_socket, *mir_vt, *mir_id; + gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *desktop_session, *mir_socket, *mir_vt, *mir_id; GString *status_text; int fd, open_max; @@ -211,6 +211,7 @@ main (int argc, char **argv) xdg_vtnr = getenv ("XDG_VTNR"); xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP"); xdg_session_cookie = getenv ("XDG_SESSION_COOKIE"); + desktop_session = getenv ("DESKTOP_SESSION"); mir_socket = getenv ("MIR_SOCKET"); mir_vt = getenv ("MIR_SERVER_VT"); mir_id = getenv ("MIR_ID"); @@ -259,6 +260,8 @@ main (int argc, char **argv) g_string_append_printf (status_text, " XDG_CURRENT_DESKTOP=%s", xdg_current_desktop); if (xdg_session_cookie) g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie); + if (desktop_session) + g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session); if (mir_vt > 0) g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt); if (argc > 1) diff --git a/tests/test-session-env b/tests/test-session-env deleted file mode 100755 index 5be5e91a..00000000 --- a/tests/test-session-env +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner session-env test-gobject-greeter |