Update tests to check if $DESKTOP_SESSION is set correctly

diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf
index 40ceded9cfcc2a240e947fb7d0aafa2926b9c9ef..cb5751cc337daa7588cb63292f5a2f014f6cf26d 100644 (file)
--- 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 53a02254f68c375911ccf2e64d4ebb67ea39c4ef..bb54dcae08bf44af57bdaff300a0bbb75dcc11c8 100644 (file)
--- 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 1ed1bcba016dfc71acda03fdee7a5628571ed960..9a4da16bdb39fab4c7f4fb860aae561c7466323e 100644 (file)
--- 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 5f170c6649ab8c37c8925093013770ad14a7929d..510bfd9b0dcfdf3b9127e766113c97df11bbb833 100644 (file)
--- 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 7323bd98d36f737d6bdbc6a0358e80eaad7bbc2f..5ab0dec5049be71482c3bc94fd82f7af0e2eaa80 100644 (file)
--- 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 0a532dc06aed8e966bbeed433ff2cde55c6a3780..6db130817b360b4649c0a32e3f044f9af191269c 100644 (file)
--- 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 4a6af9a60273dbc262350d24f1c7801289a3d4ed..b840419d1edf7fa8abd45a44feef5387c2fcff22 100644 (file)
--- 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 a203d8b446b0831e9db108c210fd1d53c9bdb184..b57325e2949965c732f4604ebd0b7727e9e5eacd 100644 (file)
--- 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 d63cee0f09c3e33208a996133622c259477c766a..59beb6d4cb6a2dea34aa6d01ed9ff634dd68bc3f 100644 (file)
--- 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 ad97f670fad599987e79e93f8dbe0bdfb5ec1f3b..38c9e460d5d291ccaa53fb8d08f9c02dbd6f20d5 100644 (file)
--- 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 0851ca428e1225bef7b0cb53eba443e443e7bf4b..7d3f6e99c5579881bcd86f9a03f7d1a948d55ab1 100644 (file)
--- 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 57bdb5b869a32f93abd80d2236ada4caae31e1d1..8cb38ac48cf6bc62256b6793f4403af00b14a1f1 100644 (file)
--- 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 43f1cb995f560bdbaffda2bf879fc40588bfab64..145a6bd841685d5b1ca00bffa2a721743f96db88 100644 (file)
--- 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 8c5463ff8f6a304eae51c88d0550333b3878274e..b233a4906dca63b16deb3a03591dc01466e6b7b6 100644 (file)
--- 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 5e7730c0efdeabc582163f02af45d38d4c5724fa..c536731613607ab3e0f4c55afdf0f2c28269b4b1 100644 (file)
--- 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 1d3e912ebee9f55ce397ab46bf74ab4aa6dc9d06..258d80e99880ab33de6b6f385eea2a3bfde3466f 100644 (file)
--- 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 818d621a6c77c5b2bfc70dd3eb46513cd9c791aa..985386cf695adcf13062c5686c7206a079dca150 100644 (file)
--- 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 38cc52f4186dab8a88d0c3ae5b8c19283ae31300..bc33db7674c26ffeedd718cf08300f469d5da932 100644 (file)
--- 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 0b2e218dd8a3c0e15553537d974aba7c567bda50..5dcbb519fa3ab20008a7b1783821e0b03f5c64a8 100644 (file)
--- 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 56d93942053a49f8217712a93cd8aa78d8cc8c05..bee18b78fd39f741e581b899a3bb35dc373d38cc 100644 (file)
--- 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 c1d22e0a43ecad8cd721c94921315edc8be6c4be..d93440fd85a025c1c942cb10ecff3dca8adc8d4e 100644 (file)
--- 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 6fbd2cabdecf6c5af9f3957757291b935621ea32..e0cf7d1b44c1e519a287cb3efaa1323e005fb134 100644 (file)
--- 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 2abe49b4f00d4738cb0871eeb97bf6e28226595d..08b4af6c96b30a3e90147fd87cc84f59b3b045e2 100644 (file)
--- 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 f7032cc569e8beac72b8f47cf2e2269ce5ac7371..58cba9182f2441909421265da2805ea451db89b4 100644 (file)
--- 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 9a6ad33822b2c36aa43e10e9d8453a40860eac3c..94b3429346b7fa7bea168c1c7a913c6bf0a03ae5 100644 (file)
--- 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 b0ea9883e67363655be5b99aad01f851559dcef7..88f7a72745f8add20035cf0653a6608c1984bfe5 100644 (file)
--- 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 4fad1abe9371a25629a8774a4ac755dea164b11d..7b4c70fb404a6196e936c512d98c1dfdc3c1ec94 100644 (file)
--- 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 4c17fe48f734c50e4bc9323e46c5ee54983e399e..68e79c4919c03f438501005aa41b96dc7c5ceebc 100644 (file)
--- 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 6a52cb065f13224dcc4eaad8de6ea332012bdeb3..2a8d15588d6936d2b95b01871451b80fc8ef8fe7 100644 (file)
--- 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 404ec1d37741b56377d7f181685067f91085184e..1b1a2697b5dca9d0851f148f52e022c49c99843e 100644 (file)
--- 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 1d72f3f0f4e048f33c8fa0909146d69923b0310d..112ad10369b88c11c7952b2ee90f4db66b381e22 100644 (file)
--- 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 c88233f8d0ad44ba197eea0b8bc15735a0f6d5eb..94c90dd2674cf958d3bfda521d22924ea0514815 100644 (file)
--- 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 ca39bde904424f67e3a5270399fc9806cc88dc7d..b4c1fc24914e74a362fb68be1950ceb2286a8ab5 100644 (file)
--- 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 e6424b111631bc3df1e38d3432a9f493e1e2876d..abd6738b23314bd3ddebf3d371af5a40c323ef67 100644 (file)
--- 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 b747ddda8b63cee724bae1813857c48ac0d2ad63..24936df56b76a31deeef88bfea36a2dfcfeebab0 100644 (file)
--- 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 0c0231223b88ee89bb46f706b1f85bfbdf948df1..ab90dd28103e409bded03f623ea5dc950c86f084 100644 (file)
--- 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 4b31ecaf70f11b112315f44bb8044fb1075921c3..2b627f4caad66ebea1b451a21d6b72588191d30b 100644 (file)
--- 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 c9e6d8de02458f7a398e2152213ab98814b05df2..ca20ed56a3e841d5dae94ac424ca4eedc1678945 100644 (file)
--- 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 f567a04c301a373c1f24c0bebb02fbb159ec464e..f5eef9f932dd87fbfa924390ca6744a75559c849 100644 (file)
--- 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 097c00d188ea6ce5683259fd34b2dda01771a032..2152c586976998f6c0a45b36e78e498a0b36d2ec 100644 (file)
--- 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 c3ab9aab902cf9b9cd3cf37caecce7eb83df81c7..40ca7dcb215e4303e42eeda1bd5001b62fd45d74 100644 (file)
--- 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 a1793d624ae69d0b896d7d2fb1f6ee483eb9b65d..b0e5386d41ee6f0a6a066b41ef2034267fae339d 100644 (file)
--- 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 7ec72f5b07ba2cda56212abf5e688b3a4059055b..37d5b40925beeff722ad57e1e3c892aa46cb0209 100644 (file)
--- 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 cb0eede80f34378759d038962634987880324cb5..1df167854d5e179eab0f701e735f597c61f11719 100644 (file)
--- 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 b3f929526faf0d0c256776b56c5e06fb216891ea..e3b2e454781a6a65730cf64f19163d1861187204 100644 (file)
--- 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 2fb77a8684afdb27d26746fad466f1c8b900b5c7..531734415e76520b4f5fd246d37cafecc2468058 100644 (file)
--- 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 0b351b64379f6fb3f6350d440d814264e52f1768..895b1bd0467189de6e5664079a7c3a1522600990 100644 (file)
--- 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 ab30b02a371c7725437996cbb2b54071781680b4..de07f94040c9094dc7281cb6a7545307ab56de7a 100644 (file)
--- 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 027d44ace7bd89e08640dd1d4be86f40f77123eb..065f46416e209e239b6cd4d9457275943e254274 100644 (file)
--- 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 c99e98c442b4f4701104587d101c97165b0c0bb2..cbddad408f499dd629160f919a59ea2235b1d18a 100644 (file)
--- 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 be4cab0e41816a78397ef62ce4318544cfb61472..0a3069e5069e1def6b2429ba2ce8a89be428038a 100644 (file)
--- 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
index 651b7e06cb62fd2c816066097c3d3a76039c3d55..d306d5fa55e990e1766d6ba139a97ad079075999 100644 (file)
--- a/tests/scripts/session-env.conf
+++ b/tests/scripts/session-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-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-backup.conf b/tests/scripts/session-stderr-backup.conf
index 5e9a0d9c72c64a052947869092648304734a8768..557337cf5590151fcee10b57444fb928aee24fa1 100644 (file)
--- 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 0b11d92d1348c89c828d0f3c2c5c4d8aae60bcc7..7b2ac36dd33ce89322f76b49a9ecb8203f7f5630 100644 (file)
--- 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 97ed4ca24ecfae8f9e958ad672e763154d071cf4..e2c311efc16b82c7112395adf4ba03e9a1bae026 100644 (file)
--- 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 37da1b98d12603157f2c243186173f0455e5267d..a03ef958ab60c98efc929850ec27135b590f0129 100644 (file)
--- 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 487742a787b3842ca1f47be0dcb312ab1d01cbc3..f2b3dbcc33953fa13ec9a181395271e231eea92a 100644 (file)
--- 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 1080954a7859828c64ce2feb8ed64870e011b3fe..9f3a9d630ab83c201ce7a4a6139d6575d1d2d04d 100644 (file)
--- 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 4102ec101b176c158b8d80b5e45af866b863c8bb..304ba15e1387c4ad69e35985a820046bf12b0140 100644 (file)
--- 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 20ca573a81d0118eaf63c921bed138b317da3719..52df42486af148a45d5a4613b7a1bc3bb9b5f17a 100644 (file)
--- 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 a6510cc60344027cf426d14b3d38008f654944ec..e84a51291f836b08242b342be827abd45dc4a42e 100644 (file)
--- 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 d8c2813b539c6cc285d41fcde7f23174ad204843..79902b88feacf7f416d5d0c6d3d5243ba67bfa75 100644 (file)
--- 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 1c3eb098f52a839870c9c2dea8e709c794f2b0c8..7c677762749df48c486140d06ac7c9e2fd174074 100644 (file)
--- 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 30556589dc8226f1440f7782175ffd7b7f15cf38..46bcca4e01d8682c5178c6413c8479d5588fbc71 100644 (file)
--- 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 4b6c8f5afaab6bd8aee50e3937381ac5fcc12910..74dbc147a35210c5467ca52ef8d229363bd243fb 100644 (file)
--- 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 ded4a31f0bd17d9bb2c5f23e4bc94d03abc3267c..825d316c3467dc5e6134f0f80e260d63672b4208 100644 (file)
--- 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 a50163315893a4c4b0961c5ad555bc0969113df4..1b9fad01fc55cdaf7bd645da76029babd833f90d 100644 (file)
--- 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 cfee1bf9049fef39fb5181f3251360156f9ec330..96a9dc1921b604342c26ab4732667c4af4f5b812 100644 (file)
--- 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 539111b3e076977ce9900e14dfe10879e8f3c728..a2d3c4e41a88fc33d8b6ef24b74c79af0c6974b8 100644 (file)
--- 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 6938ea58372f13c692757d16a807bcb5186cb0c8..a4d47d741cc88e698ab3c37245ad72aab98d2ddb 100644 (file)
--- 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 0389c52a69001db2ebce54d259199e3341b6fcee..40e5a3ccc6d33a986f3e6d79a388a4af817f5919 100644 (file)
--- 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 7882e8a853adc3028ffb769d8e530fdb3b4768a6..421d9e58bb8d6e2b0f4f10255b4a2fad9fe3ff52 100644 (file)
--- 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 d3771db6b84166be3623e0c9e3d2452e0df4a6d9..d1f3f9148d1b67d380f184c3e3cca3ff21d8f420 100644 (file)
--- 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 c27f70a038e48958b21a25abca74913d9f7368fb..1e2b14d6331ffa643f93504455d237f3cb0af01e 100644 (file)
--- 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 61914365c43a6873d3dfa210b0c644c9da2a9dbd..0d59bda5c7ef1e18529ecf986b793b6e91bfdd34 100644 (file)
--- 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 a9935d99905ad9f0256c828a5ecde0c95c3d5c89..608ca078afe0e3a85da245203a1af8003396958b 100644 (file)
--- 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 8824b006707c75c4198c7d26262af201751b28b0..2edb71356bbfc14d3ef3fcf6454eca52dd00d7a8 100644 (file)
--- 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 07bafa9bd8913e9fc1e6d38dde7a396fac59c523..3fe743ae8765fe686e054c3384ab47a3ae3e44dc 100644 (file)
--- 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 d32e51deb11366be940baaac429496057d14d7ff..6ceeefa11f051182014027f67316b06aaac60d54 100644 (file)
--- 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 80210fe2b7744a95e170ce2fa6d9972aa96bbb48..7bd8981d3f4641fa530ab20cd466e372208de146 100644 (file)
--- 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 4b02371ad672a8a3272822b818068f8cb6bdfc72..c76923dedf1040bb9ab5068bb56a178d83323060 100644 (file)
--- 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 853b3918f63b42b8520cc24c22c851ed3da85723..b396aed8a4052440b868927240c5360c1203a21c 100644 (file)
--- 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 c44732382d192b48ff471e41ccab69ced4d0bc5a..bffc1f060b8a0df7a0b4321b7b38365fe0d5df7e 100644 (file)
--- 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 c1a57e18865851d74e8b3963fd681051b8c47269..d9908ee2bd0f5595d97f16a86d0008a8d1a34f24 100644 (file)
--- 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 66fabe53393a58c2c774ab08dc45aae618f8a579..fe21ed83ec7e0e5ba91c481ea222c111362e5518 100644 (file)
--- 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 f16c9d83badf82f3489c9f2d808d138030ae9395..d3b0ee139c7777238c2715d050b507ec90f2da23 100644 (file)
--- 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 97bfa1b701d21103e01f91143f6c2e7ee7768bbf..937ba913f6ae071cba6ec0283aaee64923a434dc 100644 (file)
--- 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 a15e4546de93ceded49bb98356e9cbd1060dfa95..da13954a8f18d66ef7f095a7ac585b8493a55581 100644 (file)
--- 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 2eae1a68f09959eb9dc1a0a9795a6fbc5d300158..17162ed98b1126faea6407eeeb0b5d2375424bb1 100644 (file)
--- 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 15d9c1a35681cff589cb37dba9b5e55cb3f0b501..45a7a7f5395980a3e233ebcb39196bc7c23e692d 100644 (file)
--- 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 c6543d57689a8aa7e1e3fd79ec36f0df6cb15f7d..c2e38df555381d365c287b08299013a5d4b0ad13 100644 (file)
--- 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 544c41071ac7e2986c1f2aca4494f046fde4f156..9dac617f46f89c8e35fab23fd99707f6715e974c 100644 (file)
--- 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 fac3e97357e2c157ab6835921e5bf7a04e49152a..e18e1dcdb5294b4cebe18293716e0f8b7db9dcc1 100644 (file)
--- 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 5e731d7c24e214cab4de599bbb477f9ec802cd1c..14ce0146a7bb7d2df47a2f3bf1d547e216a89c3b 100644 (file)
--- 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)