Override logind's or consolekit's decision to automatically change active session...

diff --git a/src/seat.c b/src/seat.c
index ad4c133f76175ac4a4bcbf0cce0dc720545b4f9a..040b289d7a7d1ee721bfdcdbb7754f18b1348aea 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -528,6 +528,17 @@ run_session (Seat *seat, Session *session)
         g_object_unref (seat->priv->session_to_activate);
         seat->priv->session_to_activate = NULL;
     }
+    else if (session != seat->priv->active_session)
+    {
+        /* Multiple sessions can theoretically be on the same VT (especially
+           if using Mir).  If a new session appears on an existing active VT,
+           logind will mark it as active, while ConsoleKit will re-mark the
+           oldest session as active.  In either case, that may not be the
+           session that we want to be active.  So let's be explicit and
+           re-activate the correct session whenever a new session starts.
+           There's no harm to do this in seats that enforce separate VTs. */
+        session_activate (seat->priv->active_session);
+    }
 }
 
 static Session *

diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf
index 658c1b28c0ebe7c887f6ac51bc486fca06db59ba..b0bd89de32e2169459e6534b1c7852c66e99689c 100644 (file)
--- a/tests/scripts/additional-config-priority.conf
+++ b/tests/scripts/additional-config-priority.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf
index e8654eaec8a3d7a868276294db03f8e655d8772c..6efca7da002b0d27fde6bbcd94fe631f3b4dadd0 100644 (file)
--- a/tests/scripts/additional-config.conf
+++ b/tests/scripts/additional-config.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 44393bbaf1892dda75ecc318ef0125845170ce9b..f0926ff04b62ab4a55bbb6ea282d11f6a4c47418 100644 (file)
--- a/tests/scripts/additional-system-config-priority.conf
+++ b/tests/scripts/additional-system-config-priority.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 ffdb8a65110d398d8c85549df6164ca98057effd..76a9aa15bfefa2450d97638c5e95e2d60163a1e4 100644 (file)
--- a/tests/scripts/additional-system-config.conf
+++ b/tests/scripts/additional-system-config.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index a95ec231b7b13a99683d088f106238fa879c8b8f..6a81c9a55f26ca2e22f2cd80daae2cb6ad66f4c3 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -24,7 +24,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 9a950b8fda7e439f7adb17c447b45c875e735443..955d37f3dfda323f7ef7c3d489f97478e04fdc8e 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,6 +29,7 @@ user-session=default
 #?XSERVER-1 ACCEPT-CONNECT
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 cab64a300cbf6dd5e3b8b10e394471f4766b147a..0ea3e1efb85e46397096583c7c7681a2fc3c988b 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,7 +45,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-guest-session-config.conf b/tests/scripts/autologin-guest-session-config.conf
index bd68c876056640caaf1d009e806d7b09ecbfe1ce..8acc942f7c6b4adeee4a60d862d5e0cae018d593 100644 (file)
--- a/tests/scripts/autologin-guest-session-config.conf
+++ b/tests/scripts/autologin-guest-session-config.conf
@@ -23,7 +23,7 @@ guest-session=alternative
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 4aecdd61188343e1ac53f582f43583394246f208..30d3964f22c5d5f0ed044cc4edd6c108d05519a4 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -40,7 +40,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index 7e4682303582ca59d63dc4fada557ed529e1943c..ea8cad443853cbf9cfe7b34ebc942438396e613e 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 85d15be199191875fdac0b30e8da8467e29974a5..f97607d1e971c9c49ff3b3a29741ec24b746728d 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -28,6 +28,7 @@ user-session=default
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/autologin-invalid-greeter.conf b/tests/scripts/autologin-invalid-greeter.conf
index a7a61cace7cb481bfdfbf9ff300afbd91fb3f548..40f1266b9614ee2cd6fb7fc3bee2bfb6924ba6b4 100644 (file)
--- a/tests/scripts/autologin-invalid-greeter.conf
+++ b/tests/scripts/autologin-invalid-greeter.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index f1a6b88b4204e24d05fe2ccfc74c4464de40be22..bd480b30689009f5d667864517787dcb285876ea 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -21,7 +21,7 @@ user-session=invalid
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index 2a43132842d89d68ed355962c3496f27abdafe37..527ce2c6881dc0da8c342a8fa3513547d669d4bc 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -20,7 +20,7 @@ autologin-user=invalid
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 47e7cfc26104854e298097ab68bd06447b4dced9..f58809c99a1cf1fb0fe84bca6226f5ead08965b4 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Autologin session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -39,7 +39,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
index 13e70ea91ca18e2e494d60770829fd393f30fa59..dfa7d83d4025fcc786760c3ac20c3d7aa9e9f767 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index b7e21797bea36a268527544997ee63f0f34ab5e8..22873bb409cc769c9312b460a98f00ec35a7f7c7 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index 7b4639b64acb8660e770dae1e95ab5dea99e7ef0..20e9bf99c941bf201b443e9a0c44ea6866b42526 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -18,7 +18,7 @@ autologin-user=have-session
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 c78bf5ba0ec991cdee81693881d9fdd731d7d3d3..d71b2e41c63eb358434c59663d4ea9a2685c37cc 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -39,7 +39,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf
index 2dacd1dba18bef69f86935edbb04334c1536fd10..743168cbb41e9c91088998345e9af699cfe7dae9 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -32,7 +32,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 7bd534d5d32df48e93676a8ae8cf2b97811ab6c7..c4e96d9a1a3f6edcb4e37304162beff02e82b2af 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -17,7 +17,7 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,6 +29,7 @@ user-session=default
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -41,7 +42,7 @@ user-session=default
 #?*GREETER-X-0 START-SESSION
 
 # Switch to existing session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Quit greeter

diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index 6ed7258fefe9683ebd9c5ab9ebac93951aea12e5..61498fcecf9baa7382b8bbc3409e22a5138148aa 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -37,7 +37,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 6d3c29f5e836282467d3eca4efe9cf5297b2852d..e33b0132f71b55b9d0c53156680d3d04b0beaf8b 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -37,7 +37,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 40c9ab22f9200ad6b8d00b966f6ad28620389947..3cde2a5836af5f849a669f2f9e4dc46cff1fb535 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf
index 4093b7fd956e82d51f4403a691060790959e72f6..371684137c2647d76000ffed0faa519390ea27b2 100644 (file)
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index 4e03ae2b6c9d512516c566969202ed201e9cfb11..690ac3d55a7dc5656d9524660220d8aa198fab0c 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index f2bf0dabd1cba0504d2faccfe5be61793af12acf..f13e76b140a08edceaf302a4f486a08e1f2b59fb 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/corrupt-xauthority.conf b/tests/scripts/corrupt-xauthority.conf
index ed333537a3098ec694a1c771b6e0fb73249864c7..081edb2c9606f94f839534cada372b96b2ffee0d 100644 (file)
--- a/tests/scripts/corrupt-xauthority.conf
+++ b/tests/scripts/corrupt-xauthority.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth DESKTOP_SESSION=default USER=corrupt-xauth
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index b0b195a89b9dba98dd29a3939cf18a0f54363423..045e5442938e6360bfc967d2a04023dcfbd39362 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 3378764de5a141f952d5530f802c22785c32c103..e5ab6d066341a338bd4c326e0910a663a61a259a 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -32,7 +32,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index e737ea887b25fd8c83f75a9d976417cfb6f31f16..1c5e1b9fafd24f4c35429e1a27d2f4d215a8fa17 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -32,7 +32,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index 380d71f79b70c16808cdabd0793a20da533bcc5c..945d906f60dad6093938931cb6d4cc2e615b801c 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -32,7 +32,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
index 8d9517c517c11f4e8e89a72273850424de534b16..0bfc6179941418432b1f8311f6906858befe25d5 100644 (file)
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -39,7 +39,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index 7ca5f8508f1cda2a00de2c6746a8d0716fcf0d44..0044e440764889efb7b253cdf569a3a26f348361 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index 35ce86b12e9abd13860b9f8c515267bda15e89be..9dba5acf73cfffe431d03b08993ad146e353c099 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf
index fcf56fbd6f5c120d786a5b85dd0a5be501cb03af..aca11a4ba40609aa77dcf4d0c3d543052cf643fd 100644 (file)
--- a/tests/scripts/greeter-allow-guest.conf
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -18,7 +18,7 @@ greeter-allow-guest=false
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-crash.conf b/tests/scripts/greeter-crash.conf
index ba9702d570c57924382504d8c1f47d35fe671eb9..5f003e76070e0164cea951011a16f17a5e5621b5 100644 (file)
--- a/tests/scripts/greeter-crash.conf
+++ b/tests/scripts/greeter-crash.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf
index 2a2fdaf8e79222df4a60b016367c336f6f128312..3fcb60343a1c724f97733f8295a66190261d715f 100644 (file)
--- a/tests/scripts/greeter-default-session.conf
+++ b/tests/scripts/greeter-default-session.conf
@@ -18,7 +18,7 @@ user-session=alternative
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index 295a15286d890d68c7fb81271bfeb73f199377fd..03e0ceb8280c6cbfa3071693c913eee5324ac5d5 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -18,7 +18,7 @@ return-value=1
 
 # Greeter fails to start
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?GREETER-X-0 EXIT CODE=1
 
 # X server stopped

diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf
index 861bf55c47d010402f826af78bbeb647ffc4c2a6..5a8f440f1272b1e0c9cc9df90c085c19a92b1cd1 100644 (file)
--- a/tests/scripts/greeter-hide-users.conf
+++ b/tests/scripts/greeter-hide-users.conf
@@ -18,7 +18,7 @@ greeter-hide-users=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf
index 1b172ddf7827834ba515995b9df4d000debd1812..2e969d82577a8706fb2d3e1d1adecb2cc442794f 100644 (file)
--- a/tests/scripts/greeter-show-manual-login.conf
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -18,7 +18,7 @@ greeter-show-manual-login=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf
index 591b72294ac28d6befa349e175b0626160611276..fb207233a43957319767fd19e9274e66facecaf4 100644 (file)
--- a/tests/scripts/greeter-show-remote-login.conf
+++ b/tests/scripts/greeter-show-remote-login.conf
@@ -18,7 +18,7 @@ greeter-show-remote-login=false
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf
index a0c39f00a16cf9dbaa271c00683f50a48bb4f18c..abf36aceaeaf7fc6ab2c2d5eab7e2e4adb6991d8 100644 (file)
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -21,7 +21,7 @@ greeter-wrapper=test-greeter-wrapper
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 0c90d1d90b2ac7eaf66560480e24ec2f64e7d81d..ec6c332bf20edb6148c5826c1ede5b6a24998589 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -37,7 +37,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf
index 9b82d7b82efffaf71afd4d977e8b7e64b8bfb251..80bc8c0a96e999a5ec412e70411d3073c37ce161 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member DESKTOP_SESSION=default USER=group-member
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/guest-wrapper.conf b/tests/scripts/guest-wrapper.conf
index b5fd61043edcc7adb3ea01412014dfac8b665c6c..4a9cfdc2c21a58c99bb5542b345720609ba75d46 100644 (file)
--- a/tests/scripts/guest-wrapper.conf
+++ b/tests/scripts/guest-wrapper.conf
@@ -26,7 +26,7 @@ guest-wrapper=test-guest-wrapper
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 9620aaf2d1336781c5accd85071a52a471b5c4a0..25bbe299bf70c62afd06d43e2a3f41160a5a7810 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir DESKTOP_SESSION=default USER=mount-home-dir
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 6401c2fafd171b32e7c4ee3bac7c2894a809224a..2739d0d3f5ef3b3b5a3e149d42a5e2fdb5fd5b60 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir DESKTOP_SESSION=default USER=make-home-dir
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf
index 34129f33047758eddbb901f18b5280f8e4c8490e..fbfb4d4077099c4140ee769ccb2872ad25dceee7 100644 (file)
--- a/tests/scripts/language-env.conf
+++ b/tests/scripts/language-env.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language DESKTOP_SESSION=default USER=have-language
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf
index a3158732676189cf2056a5993b045b1dfdbec607..d4162427837de4f304361432d0a2e78d8b3d11ba 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -18,7 +18,7 @@ disable-accounts-service=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
index 8b32c5aba6aaf56d42859ada5916bfa2726c6369..19e776aa2ce54322557b192fd40dc780675f8e5d 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
index 2b8518a4b0ab724ba85767a4e09cfb463a987697..5ca356da22ffe5e000142001f0381f209bdcdf6b 100644 (file)
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -50,7 +50,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:1
 #?VT ACTIVATE VT=8
 
 # Cleanup

diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf
index e799bd2fbc2c014dab8909667a15326394ad8b28..563532a9f68e2590d31974f42a985b676969ff1c 100644 (file)
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -50,7 +50,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -64,7 +64,7 @@ user-session=default
 #?CONSOLE-KIT UNLOCK-SESSION
 
 # Return to session
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop

diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
index 51e70655df1a0067a6b32a0f0396992346340757..104ffeb2801806e48a83abb06ea53a427f182af0 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,7 +47,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -61,7 +61,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Return to session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop

diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 64a2ba37ae85a7ecfbdb5594057cc3a755e527fb..537040b9b4aef4141a39a8b21ed5dca5c47174d9 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,7 +47,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Cleanup

diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
index 42bbf55c405c12b90f4251884ee1a6604e0e89f5..80f64292e9cde172787d3b748b003059e396c7b0 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -48,7 +48,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Cleanup

diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index 1517e27124a0ffc998f7a2ad5460f48733bbcee4..fd45d1544a215c145e081e5566b240631ce0cee1 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -48,7 +48,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -62,7 +62,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Return to session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop

diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index c0808e1c65fe3f3077382070fc471fac468f4719..db06359ee20e7e0a0250f4e23436342c7f42df6d 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -48,7 +48,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Cleanup

diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf
index 1c725de16de121a938a25e2b5b2cb13779caea61..19634a1aef05dbc3008b83f25f4dca5650505253 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index 7b3e195a610e330f5f657e5f6bc9a30ab076c3f2..6cb33fe9c766fbaf8d5ad5ab3e765fc3cfc95593 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -18,7 +18,7 @@ allow-guest=false
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index d5b007c744c7264f31a4d0cd334a264430ea00dc..e45fe6dc8ff5d5b9fa30cb6759ce4833fca10468 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -37,7 +37,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index dc64dbf60f63897c5867581ba66be03c0b0c4ac3..c88f797129d1c74f71072f82c6178d8053abe32e 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -35,7 +35,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -58,7 +58,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
index 7dddbb8af4ded414ba7ed8cd153b0d94f9e38693..754fdb75b4136a4163b5c8d192b53dd39a8bb626 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -18,7 +18,7 @@ guest-account-script=
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-guest-pick-session.conf b/tests/scripts/login-guest-pick-session.conf
index 0ee36d38e5e09c8008f13629b623179bc9e16248..8efe108cc9b4e9bfe86d80fafa5be399eafa538e 100644 (file)
--- a/tests/scripts/login-guest-pick-session.conf
+++ b/tests/scripts/login-guest-pick-session.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -35,7 +35,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-guest-session-config.conf b/tests/scripts/login-guest-session-config.conf
index ab903d41c0a2c5a8f17b32631b961bdd495641c4..0d568fc491afe78321a4798ee49153b65614a136 100644 (file)
--- a/tests/scripts/login-guest-session-config.conf
+++ b/tests/scripts/login-guest-session-config.conf
@@ -19,7 +19,7 @@ guest-session=alternative
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -36,7 +36,7 @@ guest-session=alternative
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index c5b13c536f6292583f3dffcc10163a6f4efd0e07..96f50375b86039077ab71b109422ffa0b7f0650f 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -35,7 +35,7 @@ user-session=default
 
 # Guest session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf
index cccc5721a978bf39636822e565ffcd5521b05cde..07ea2e932caad40b3b3d417493478771b4410b67 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index ce2381c4d60fef06b51014b4da3bce970db3ebda..0bab7fe1d92110f176aeb7b87555df632c4e72a3 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index e76b40ed051fc152933190fa7d596d1a5efb2992..71ba514f70f1864c095ca6c7c548384d1029cd11 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 0af754aa15814ff4176e5cee0bbd9cd6017cb741..e28bb5a61355a02df843d508d08b5b1977bb0f64 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -54,7 +54,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf
index f6bef23abfb97e2012f88f34cc8e62b0bc096e12..ed69d4561b0b169a03f69273792160c326868bc7 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
index 8a1646c6ddce22ea8f6cec3b4aeb728f58518509..b206a97dfe5f632987f8c24f2a56f059b6eceac1 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index 05d1e7cc603550715b7fc32ff21ac054be7dc467..ee944f2fa4cff1b70128a94f0f313dd6eeb8eca8 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -31,7 +31,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-manual-remember-session.conf b/tests/scripts/login-manual-remember-session.conf
index 91dbaa184bca9c5e04174cadcd42933674706372..88f348a6f432bf758fcff670c84742c244a15a51 100644 (file)
--- a/tests/scripts/login-manual-remember-session.conf
+++ b/tests/scripts/login-manual-remember-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -31,7 +31,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -51,7 +51,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -67,7 +67,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index 95c33a1a6b64b007e56805f128acd63928faa602..2f067fe3f3a2bdb3b3157e7222fa3a9c36ebae0c 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -36,7 +36,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf
index 5d6ca6d1ad2e532335e44a51875ccfc66e0c7673..7b1b5b2e42a01c5c1d91a9275c3c4b81b518d802 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
index 94b9c168b4273fca0af128e883095ce893af00e1..982f5deb750742c5e355501a7a0a9ebd9c001525 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index ab681464b23908b4ba2134fa0b88c9a4c529fe28..aa706202065418298a21338b355eb44b4518d862 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok DESKTOP_SESSION=default USER=new-authtok
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 6143cf460d2ff002a66cc491cb19803aa6c0fbee..ea0dc0e2e1c7346e62dbffab06138d519e750e16 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -32,7 +32,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index ec971d4447869745a96c4f2b28dd3b6dbb6a337c..49710effb0c1cbaa47eacde42efe08660c7d6965 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -36,7 +36,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 8348a47cab41c69fc964a85416b57fbe08d793f2..89bb7a66657820e51c2516d22affbaeb492212c4 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,7 +29,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 d26c6fb56c23a455deb873eafe649bc58523367d..c1836ca6e474df6ae65caa75fa800e973ebb00da 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,7 +29,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 9f6bd3778a925ce3bb4db47392c132ef32f2174b..9a9a100cca48440f7ac8fd1f2f4ddbd6193cf487 100644 (file)
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,7 +29,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -49,7 +49,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -63,7 +63,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?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 475fefa0e16095934782e16a3e049ffd069fb785..df6f63e907308f187ced6fb0873c98182f59f8a8 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -38,7 +38,7 @@
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=test-remote USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 3e7bb52765926c19319a8c4380a4b2a9327f981b..01d37b706ca584e3b2acd06b03d67702a184b410 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -54,7 +54,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf
index 149d4dc609184faa54dfc222ce256d706189e556..23f4c28c873a745122541450b67c0746cb10ab76 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index e510a55ea4884e958edfef3ce1009d933d231c99..b96189a590669bbd5ab62e1b48fbf6c58f28901f 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 6951c2b37fece579283505e890039a77149beba4..c19927d16c56bca46db2ff43abdf4a435bea1ea5 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -52,7 +52,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index 91085cf7ee2f3a054806e7bbd69d9a97ccba17d6..29d76b913f53e108b2742c64f265749ddcdb7e4d 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index 6a39e3de5699720b004959003d5c1a1bedce0b4f..0be08e47c45fb21b23a66fc8d3358b2992ef568d 100644 (file)
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -15,7 +15,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf
index b270fe9843dfa19051facc1ffb26f7b749fa5520..ed4751a9fde8eb2b3fb19b16c0da1c369723a099 100644 (file)
--- a/tests/scripts/mir-greeter.conf
+++ b/tests/scripts/mir-greeter.conf
@@ -11,7 +11,7 @@
 
 # Greeter starts
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 

diff --git a/tests/scripts/mir-session-compositor-crash.conf b/tests/scripts/mir-session-compositor-crash.conf
index eab24b08845dbe3d79391bfda5cf2aaf9ab09d84..2040a14cc318f14a11e25f5b7c4fb95731d8c442 100644 (file)
--- a/tests/scripts/mir-session-compositor-crash.conf
+++ b/tests/scripts/mir-session-compositor-crash.conf
@@ -15,7 +15,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Crash system compositor
 #?*UNITY-SYSTEM-COMPOSITOR CRASH
@@ -33,7 +33,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/mir-session-crash.conf b/tests/scripts/mir-session-crash.conf
index 1af41f30e919ff6842a7ea6d096e00718ca126e2..5d88dd8a39200c1800b53820113928a0504bdcb2 100644 (file)
--- a/tests/scripts/mir-session-crash.conf
+++ b/tests/scripts/mir-session-crash.conf
@@ -15,7 +15,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Crash session
 #?*SESSION-MIR-session-0 CRASH
@@ -33,7 +33,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
index a9e772b94755e0b916b33cc71da04f2fe7877834..35d794f34f697a1e48e165ce33bf92477c3b7072 100644 (file)
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -18,7 +18,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -42,7 +42,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/multi-seat.conf b/tests/scripts/multi-seat.conf
index 50e1572027a01c464e63b5e24c807291d1e41a82..1fc306973b9028e5c8f9c7b006631b5922cc469d 100644 (file)
--- a/tests/scripts/multi-seat.conf
+++ b/tests/scripts/multi-seat.conf
@@ -17,7 +17,7 @@ xdg-seat=seat1
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -29,7 +29,7 @@ xdg-seat=seat1
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON

diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf
index b2637f9d98dcef4830a5161634e2cd43d92f0e6a..4735230e7a581b8bdcaafb00302fe2b44700b342 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
index 9724830d54344d2657e08ed982df8f1a134dd5d8..7250f96cb4dd392bd3d8eaed6b6c793160a093c3 100644 (file)
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -18,7 +18,7 @@ have-config=false
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index 969e722f6d7dbf4bd344cb666b298e16379fd534..63ca37280e5dd6b40a9a5d5f26258e08b4013476 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf
index df3a4ba05fcf1716b4384a1885a6735b9dd5970f..533e40f6ba89043d56a6860abf7310e5a83daea4 100644 (file)
--- a/tests/scripts/no-login1.conf
+++ b/tests/scripts/no-login1.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?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 338fc0ac0f47ec21cb32d768dcf41113699e2dea..e4a4c5a8aeb0c9328c40c4784fe14e0af517756b 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -35,7 +35,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 09463831ef770851b285086c6e8faa26d75ce098..21cfeebd939d7fe57c6236e4da3b8ea0dd1a8e28 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
index fc8db6acd9b6214f036bd2b81a17e0301919778b..e7da8a828f4827f1cd68b85ab2f40da774c35102 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -28,7 +28,7 @@ active=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index 353a40a4fc77454f8f73e0a60999813b721c5005..754cd049c412dac97bcdbb681780c75c018c0605 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -22,7 +22,7 @@ active=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index 1bd80a417ea5c93074b5d4babc7cc0f86a82332f..9d3b6060b9cb1f9547eec5740d609f7871433700 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -18,7 +18,7 @@ disable-console-kit=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf
index ea12d5194b35b716bf70220afeb0d9b584f84a93..79df9b4c9ddac539239f259f66bd10cf06e51422 100644 (file)
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -18,7 +18,7 @@ disable-login1=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_CLASS=greeter
-#?CONSOLE-KIT ACTIVATE-SESSION
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
index 02bf469700bd201df3bb5f7ccbeda5dcfc9c73f2..e84d0b981e80e2b73df9e906faa62bd5a5f73a36 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index 802e2a19b2f6f24972d29588ff28320bbd2a8357..78e955103d9f26f3ad49ec6c6053162a9c7d25da 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/script-hook-session-setup-fail.conf b/tests/scripts/script-hook-session-setup-fail.conf
index 78d99f1fd666afd659e36078fcbb1ea9bc0471cf..de856ae1168d535225279dac6a593a3653b530e0 100644 (file)
--- a/tests/scripts/script-hook-session-setup-fail.conf
+++ b/tests/scripts/script-hook-session-setup-fail.conf
@@ -23,7 +23,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/script-hook-session-setup-missing.conf b/tests/scripts/script-hook-session-setup-missing.conf
index e5aaa7fd5652ebfa11df61ee8adcc1cbaeaf0c41..4e359330b818d2c5ab3cd2860ff91c439afc1b7e 100644 (file)
--- a/tests/scripts/script-hook-session-setup-missing.conf
+++ b/tests/scripts/script-hook-session-setup-missing.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 61f0c64f9e98e5641f3173b58e55f05b9578b879..9b1b2af6bcf5af3d0908b889af7a8e2af705d290 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -28,7 +28,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -58,7 +58,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index a3df873ed031570c7dd17a57092d537765d449d4..6100bbd8048eb9ffda14269601ba9d4b77055505 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -36,7 +36,7 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -46,7 +46,7 @@ user-session=default
 #?*GREETER-X-0 START-SESSION
 #?GREETER-X-0 TERMINATE SIGNAL=15
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -67,7 +67,7 @@ user-session=default
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -77,7 +77,7 @@ user-session=default
 #?*GREETER-X-0 START-SESSION
 #?GREETER-X-0 TERMINATE SIGNAL=15
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c4
 #?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 4cf2fd45f480943dbfef58256f4847fde29f98fe..2eb9af30583245fd91e95af490a181d3ffd54ab0 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf
index 68635a16ad9fd91da24331b014f7944aa54a5c39..006c81136c3ade52c1846ba532f2945a777456fb 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf
index 14e1de95f6b6f19c2412a6d8a0e47b37d8987279..6367b550acb5ae391f1d7f76d71852e7376ca100 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/shared-data-greeter-to-session.conf b/tests/scripts/shared-data-greeter-to-session.conf
index d7b2131889a7294491015738778655894cfdbbfe..4b60d80dda6cb22f74a86ca1144c8cef72a4dec0 100644 (file)
--- a/tests/scripts/shared-data-greeter-to-session.conf
+++ b/tests/scripts/shared-data-greeter-to-session.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -36,7 +36,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/shared-data-invalid-user.conf b/tests/scripts/shared-data-invalid-user.conf
index 1a459caab869a4bd2910a77232d5592c43e12333..09fc277f9010ca386c3a9c01d5ec150dd87a6b8c 100644 (file)
--- a/tests/scripts/shared-data-invalid-user.conf
+++ b/tests/scripts/shared-data-invalid-user.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/shared-data-session-to-greeter-autologin.conf b/tests/scripts/shared-data-session-to-greeter-autologin.conf
index 0d1018b382921b14f641551bf1b42d150a2c5bde..ca999022e603c2c5463f50fa8919cdbf26733e0d 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter-autologin.conf
+++ b/tests/scripts/shared-data-session-to-greeter-autologin.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -43,7 +43,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/shared-data-session-to-greeter.conf b/tests/scripts/shared-data-session-to-greeter.conf
index 1807d9a623fdb00b31d05772115fdd66eb6e55f1..0c76e2fb055e9e1d2ca4c772865c0c9778f16c50 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter.conf
+++ b/tests/scripts/shared-data-session-to-greeter.conf
@@ -18,7 +18,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -32,7 +32,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -56,7 +56,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/surfaceflinger-autologin.conf b/tests/scripts/surfaceflinger-autologin.conf
index 61e65d983edb7d9ce31659225e2b17d3714d8dd9..9ddb76f61e6eca1394787ea704fe63fc8eaaded2 100644 (file)
--- a/tests/scripts/surfaceflinger-autologin.conf
+++ b/tests/scripts/surfaceflinger-autologin.conf
@@ -12,7 +12,7 @@ user-session=surfaceflinger
 
 # Session starts (test session doesn't know it's in surfaceflinger)
 #?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=surfaceflinger USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index fc8f2301b5017738f4f392cd171662d90ff6304a..d43ef18d262db798687afe436e9a1a53ca226e63 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,7 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login
@@ -59,7 +59,7 @@ user-session=default
 
 # New session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?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 1ed69c652a54ea2c64a43fd9e049e543e16212be..f41941d4a6316699288aab83fa78a6550e866111 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,7 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -60,7 +60,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop
@@ -79,7 +79,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
index 94c90d2f91b719bba9570b10413eb13c9f5ddcd2..9d8ae2ce524a81b71ed2a20e9776ef42995624da 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,7 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -60,7 +60,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop

diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index 060ce766ee083cb5be5c9d2f88de5ec83f7b8a01..2791aca81f4384fda656f9d17230162069fb324d 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,7 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Cleanup

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index f63e74906a2f1db2bb2caaca5844e38aa456c382..58856c827fe62295d52583e146b592475e94e21b 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Default session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -48,13 +48,13 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Switch again, should not do anything as guest already running
 #?*SWITCH-TO-GUEST
 #?RUNNER SWITCH-TO-GUEST
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?*WAIT
 
 # Cleanup

diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf
index 5aa61c4bf5d440bf5eb4b17dcfd5323bce351fa3..c65233d7f1bd214ee144aa81302331676c041a07 100644 (file)
--- a/tests/scripts/switch-to-user-active.conf
+++ b/tests/scripts/switch-to-user-active.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 1395e9afc31697fdf42b9401803eb04162697595..8222d1f2619729540479405a4f424e396c2b2a70 100644 (file)
--- a/tests/scripts/switch-to-user-existing-no-password.conf
+++ b/tests/scripts/switch-to-user-existing-no-password.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,7 +45,7 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Switch back to first user
@@ -59,7 +59,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Switch to first session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Cleanup

diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf
index 9feb1e3c367f1c527ddbb2d1e33507a754aa0082..d7a69fcd8b7d8d12f4da150dfe451ff32eed8c21 100644 (file)
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,7 +45,7 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Switch back to first user
@@ -72,7 +72,7 @@ user-session=default
 #?GREETER-X-2 SELECT-USER-HINT USERNAME=have-password1
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?VT ACTIVATE VT=9
 
 # Log into new account
@@ -90,7 +90,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to first session
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Cleanup

diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf
index 4d9b72e6349f70b127f9c1cdc72e6287dfe2fbfd..e27af5b5e77403e73e44a2e56a5bac803b472466 100644 (file)
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -41,11 +41,11 @@ user-session=default
 
 # Session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Log out new session
@@ -62,7 +62,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON

diff --git a/tests/scripts/switch-to-user-logout-inactive.conf b/tests/scripts/switch-to-user-logout-inactive.conf
index ec82891d0c5d0d3e6557c85e52b830f56e13922c..7f53bab482b69075a08cf35b721e8b8dda1e54a0 100644 (file)
--- a/tests/scripts/switch-to-user-logout-inactive.conf
+++ b/tests/scripts/switch-to-user-logout-inactive.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -41,11 +41,11 @@ user-session=default
 
 # Session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Log out old session

diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf
index 20a3d17f73f2e83d3d35c2a4562ad40a3369d52d..608b983238fdde82c33db341eb6abadc3186d83b 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -39,15 +39,15 @@ user-session=default
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
-# Switch to session
-#?VT ACTIVATE VT=8
-
 # New session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?VT ACTIVATE VT=8
+
 # Cleanup
 #?*STOP-DAEMON
 #?SESSION-X-0 TERMINATE SIGNAL=15

diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index cf3a21206589fcab287fa8978afc9409f04376d0..4647076b17d7d67897a636de493c225c50f16b57 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -41,13 +41,13 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Requested user is automatically selected

diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf
index dd25d5f70bb504b69ebccf39dfbf6edfcc929666..2c50c39676ffdb2d46e081873e291cd4b1d28afc 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -20,7 +20,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -39,15 +39,15 @@ user-session=default
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
-# Switch to session
-#?VT ACTIVATE VT=8
-
 # New session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?VT ACTIVATE VT=8
+
 # Switch to another account without a password
 #?*SWITCH-TO-USER USERNAME=no-password2
 #?RUNNER SWITCH-TO-USER USERNAME=no-password2
@@ -60,18 +60,18 @@ user-session=default
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
 
-# Switch to session
-#?VT ACTIVATE VT=9
-
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
 #?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-2 ACCEPT-CONNECT
 #?SESSION-X-2 CONNECT-XSERVER
 
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+#?VT ACTIVATE VT=9
+
 # Cleanup
 #?*STOP-DAEMON
 #?SESSION-X-0 TERMINATE SIGNAL=15

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index 0762345c016d723ce07221b67b91832ea0183270..fd16d65bf498b009987eac2542be2019588fa0da 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -22,7 +22,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 5e79b8973387484ae371ece9dba85d10ea5b63a1..b1998993f46ce16f989ecb9d446ae303ac761aa9 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -24,7 +24,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index d445c98de4c7c1349a0998762adfa3186cc690be..49612e85bbd4fa36a295a05c6aa2d3b97f0e7649 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -24,7 +24,7 @@ unity-compositor-command=unity-system-compositor --test
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/unity-compositor-crash.conf b/tests/scripts/unity-compositor-crash.conf
index 1ea002a00e53da164c4be86266cd6b4fc1a7eaa5..c9ffc6e05853144b67d9802a95d62922d836d6f8 100644 (file)
--- a/tests/scripts/unity-compositor-crash.conf
+++ b/tests/scripts/unity-compositor-crash.conf
@@ -22,7 +22,7 @@ type=unity
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf
index 8b8e3a7a1ed338e440750fea9e7cc12371b98a44..4ceb1369ae2913437346be327bec65dfd88cc305 100644 (file)
--- a/tests/scripts/unity-compositor-fallback.conf
+++ b/tests/scripts/unity-compositor-fallback.conf
@@ -29,7 +29,7 @@ type=unity;INVALID;unity;xlocal;
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf
index bc518a371f906a9e2d74897d14eab6183ef06ee5..720f99b3cd236bf52988472bdcdd3f35de880c52 100644 (file)
--- a/tests/scripts/unity-compositor-mir-next-session.conf
+++ b/tests/scripts/unity-compositor-mir-next-session.conf
@@ -17,12 +17,13 @@ autologin-in-background=true
 
 # Greeter session
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
 # Background session
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=mir USER=have-password2
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to greeter
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index dca643377eead0fcb0b6efdff2deac574e9d059a..0e82f59435a6f955ac21a26a3cbf8f2065810347 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -21,6 +21,7 @@ autologin-in-background=true
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -32,11 +33,11 @@ autologin-in-background=true
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
 # System compositor switches to greeter
-#?LOGIN1 ACTIVATE-SESSION
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Switch to user without a session

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index f677c168b4345adeb2e42bdb14b174e925465fc7..fb0cc943c4937e6f65a8171787d6ec9ad466bb25 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -23,7 +23,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -42,7 +42,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 3d0cb947dc1b3cdeff408075d01d9659e39f4d0b..d09aec3985910a40e0912de74026a492e865c294 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -16,7 +16,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to session
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0

diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index 417fc987720e0b4f539bfacb85f4eecc0934d35d..0c8e29ebce4485484fba672d2d9df45d570e766a 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -15,7 +15,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
@@ -29,7 +29,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # System compositor switches to session
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0

diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index 70df57e276fcee65a3de5584dfa92c16360095ff..0927a186ab158118452f0c56f943c471e62cbc72 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -15,7 +15,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
@@ -37,7 +37,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/unity-mir-lock-seat.conf b/tests/scripts/unity-mir-lock-seat.conf
index 635a9e583bf28fe45833c247101482e09ed9f794..1593249a0adefa19bac0586fe9c790fe3def1d7a 100644 (file)
--- a/tests/scripts/unity-mir-lock-seat.conf
+++ b/tests/scripts/unity-mir-lock-seat.conf
@@ -16,7 +16,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to session
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
@@ -30,7 +30,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 #?GREETER-MIR-greeter-0 LOCK-HINT

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index 19ac643b441d559f7a4a1ee113440b79d300c6fd..c7c0d074830b2c3dcf11ce9063175881de3a5d16 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -23,7 +23,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -39,7 +39,7 @@ user-session=mir
 
 # Session starts
 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # System compositor switches to session
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index b8a1657f4098ea4adcbc402f629ec291dc82e245..fa236a0d82addb3ad3baf45334470220084bd2b4 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -34,7 +34,7 @@ active=true
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index c2d237153659eb55595a367c1ee72b49961bb6c5..72c729428ddca72b6ced46ff991ed4af58d5349a 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -24,7 +24,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -48,7 +48,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -67,7 +67,7 @@ user-session=default
 
 # New session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -83,7 +83,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-2 ACCEPT-CONNECT
 #?GREETER-X-2 CONNECT-XSERVER
 #?GREETER-X-2 CONNECT-TO-DAEMON

diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf
index bfe43880d2874f346405f67051b60c2a5b46fef9..48260d05d7206c7fddf160c39b5090471e303a65 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -25,7 +25,7 @@ xdg-seat=seat1
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf
index 46298af3268087284cb8eec308737206c1e4138c..2dd11558235eb6cef2b735333b4259efec964649 100644 (file)
--- a/tests/scripts/upstart-autologin.conf
+++ b/tests/scripts/upstart-autologin.conf
@@ -25,7 +25,7 @@ report-events=true
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf
index f1143e5d6accb0f5146a2d6db0c3febbfad5bb5f..70d9587e559549ab62d6e84177bf6bb55ffaf874 100644 (file)
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -23,7 +23,7 @@ report-events=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -41,7 +41,7 @@ report-events=true
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/user-background.conf b/tests/scripts/user-background.conf
index d037397137ec5313747912f95f879da42cdc0a57..245362c350e83bb0de82126a96d8c47e3e73da2f 100644 (file)
--- a/tests/scripts/user-background.conf
+++ b/tests/scripts/user-background.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-has-messages.conf b/tests/scripts/user-has-messages.conf
index 658e184003ff25c6b1b2bfb6de1f6f0265a9e4ea..a5dc9d47f0bdfe89bdc98f565458d8a0bfa5f2cb 100644 (file)
--- a/tests/scripts/user-has-messages.conf
+++ b/tests/scripts/user-has-messages.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-image.conf b/tests/scripts/user-image.conf
index 9f18d9b65739da3825b5d6d7284a1b18d79c84b3..d91e9f77c7d56d5eb3ebaf7069b7f59742178e53 100644 (file)
--- a/tests/scripts/user-image.conf
+++ b/tests/scripts/user-image.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-layout.conf b/tests/scripts/user-layout.conf
index 6bfd3471ba4dc1978e8d728df03f91d3740e2d6d..0abce2cfef1219e7a6fade30e74498f688692737 100644 (file)
--- a/tests/scripts/user-layout.conf
+++ b/tests/scripts/user-layout.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-logged-in.conf b/tests/scripts/user-logged-in.conf
index a632c5edcc92a9fdf748bcb32bab3e7898fad167..8f22cdebfa2fcfc8983abc70ec0f93e8f35c0ea4 100644 (file)
--- a/tests/scripts/user-logged-in.conf
+++ b/tests/scripts/user-logged-in.conf
@@ -21,7 +21,7 @@ log-user-changes=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -39,7 +39,7 @@ log-user-changes=true
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -66,7 +66,7 @@ log-user-changes=true
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?VT ACTIVATE VT=8
 
 # Watch a user for properties changes

diff --git a/tests/scripts/user-name.conf b/tests/scripts/user-name.conf
index d0903ed533af46f90c71a6ce08ac9700aaa609c4..e44c3042f68e55718d1729c8e8eb29e687a3d03f 100644 (file)
--- a/tests/scripts/user-name.conf
+++ b/tests/scripts/user-name.conf
@@ -15,7 +15,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index 5fd94b053a8006af1edc7927ee1b5fae0916c2ab..c17ceddc99df6c1acd5f62ec628d55f10a2a7636 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 3d95f470e694cbe6bee8764b7e9402ab921d8e7a..22eafb4df93a24c95ffabb50c2b8eee92871ef4c 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 DESKTOP_SESSION=default USER=change-user2
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/user-session.conf b/tests/scripts/user-session.conf
index 5591a8c2b4c365e3ad7557936bf15e844bc581c1..72224276c57c52ffc3392e4a6c9c6405d5700f57 100644 (file)
--- a/tests/scripts/user-session.conf
+++ b/tests/scripts/user-session.conf
@@ -21,7 +21,7 @@ log-user-changes=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -39,7 +39,7 @@ log-user-changes=true
 
 # Session starts, check it uses the default session
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -57,7 +57,7 @@ log-user-changes=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -86,7 +86,7 @@ log-user-changes=true
 
 # Session starts, check it uses the updated session
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=alternative NAME=alternative USER=prop-user
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf
index 30161dbdb4ee3c994287f844a2a588dfa2ffb938..020aaf9505794445ce226a2a4bb175a0121be174 100644 (file)
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -21,7 +21,7 @@ log-user-changes=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/utmp-autologin.conf b/tests/scripts/utmp-autologin.conf
index 2898b5709a661f5d0f3e3c40f948c13eba70f589..71404e761e30f66d851d81ebb277f0a1c4fc99ec 100644 (file)
--- a/tests/scripts/utmp-autologin.conf
+++ b/tests/scripts/utmp-autologin.conf
@@ -26,7 +26,7 @@ user-session=default
 
 # Autologin session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -50,7 +50,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/utmp-login.conf b/tests/scripts/utmp-login.conf
index 4738a90b8c622d4bc2f48d33fbbd47f1a88504e4..430fd208ca02578542e94a7b0f575dc68baa3f15 100644 (file)
--- a/tests/scripts/utmp-login.conf
+++ b/tests/scripts/utmp-login.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -41,7 +41,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -65,7 +65,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/utmp-wrong-password.conf b/tests/scripts/utmp-wrong-password.conf
index 6101c106dc8d00216514b71398388df30e123737..b909075260780999a375a4a4d896c2159a49b082 100644 (file)
--- a/tests/scripts/utmp-wrong-password.conf
+++ b/tests/scripts/utmp-wrong-password.conf
@@ -18,7 +18,7 @@ check-events=true
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
index 0fb24cd282f5bb6ac81f34954e246aad2262317a..a99cec7b0e22a49cc266af006493579f606c7f6d 100644 (file)
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -34,7 +34,7 @@ command=Xvnc -option
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf
index 03b2456d610c789938b6a7c98abcca3c5e53ed33..e1edba07139ad75945bbce4ab53c619457fb0f22 100644 (file)
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -36,7 +36,7 @@ depth=16
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index 2ef89aa3f5fd52435ce5305aaa1e614880619a5b..def7cfe0770e29d0dd5f87b87aadd9f4984cb57e 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -38,7 +38,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -54,7 +54,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 d5ee4117bccc350a62db343b63b651e39a01837b..ce54a3935896028e5aad723127547bfdf64cfbce 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -37,7 +37,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -53,7 +53,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index 31e264ae27ee3718178510b62bd0f535a8b32f51..4aeeac22936ff49328c08086b490102ddfb64ef3 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -19,7 +19,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 284d17365695a3bd6839a05d71c1c17636acfa43..9e2a23b9db35832e54253aa3a0644ab60289eee5 100644 (file)
--- a/tests/scripts/xdg-current-desktop.conf
+++ b/tests/scripts/xdg-current-desktop.conf
@@ -19,7 +19,7 @@ user-session=named
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/xdg-seat.conf b/tests/scripts/xdg-seat.conf
index 6ba89780045e3f09409c134722e4ad255050c058..c8188546f08d2a59a661dc7baa06b186306998b8 100644 (file)
--- a/tests/scripts/xdg-seat.conf
+++ b/tests/scripts/xdg-seat.conf
@@ -20,7 +20,7 @@ xdg-seat=seat1
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?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 165179ca24ebd2767510a3f0b23e6b05f5999503..590639ed04e56a30b5963ec882d5ee536d4a41a6 100644 (file)
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -35,7 +35,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-98 ACCEPT-CONNECT
 #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
 #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
@@ -51,7 +51,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 7139ec0387c8d365fea9cc017e5f12ee8c703f6a..aa55db0e814c1f971b4802cffa8c1d1d67b3a500 100644 (file)
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -35,7 +35,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-98 ACCEPT-CONNECT
 #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
 #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
@@ -51,7 +51,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?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 b4e807188453c9c9b583f3610789f3466b76e1cf..41a9f8aea47f8817f9161d6f14d5a4a33f4aa255 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -19,7 +19,7 @@ xserver-share=false
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -42,11 +42,11 @@ xserver-share=false
 
 # Session starts
 #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Greeter stops

diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 1e2d55913a63de6400a67555e5c38856c9262292..30f2fef7677c224c3737fc0e863f2c56da0c18c4 100644 (file)
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -1160,7 +1160,10 @@ handle_ck_session_call (GDBusConnection       *connection,
     }
     else if (strcmp (method_name, "Activate") == 0)
     {
-        check_status ("CONSOLE-KIT ACTIVATE-SESSION");
+        gchar *status = g_strdup_printf ("CONSOLE-KIT ACTIVATE-SESSION SESSION=%s", session->cookie);
+        check_status (status);
+        g_free (status);
+
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
     }
     else
@@ -1293,7 +1296,10 @@ handle_login1_session_call (GDBusConnection       *connection,
     }
     else if (strcmp (method_name, "Activate") == 0)
     {
-        check_status ("LOGIN1 ACTIVATE-SESSION");
+        gchar *status = g_strdup_printf ("LOGIN1 ACTIVATE-SESSION SESSION=%s", strrchr (object_path, '/') + 1);
+        check_status (status);
+        g_free (status);
+
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
     }
     else