Expand on earlier commit to activate sessions explicitly rather than implicitly by...

diff --git a/src/console-kit.c b/src/console-kit.c
index 3c261ca186e1544c7f4eaf262ba699ae5351c92e..41ffbc49cbaaeabe7d1d54ad9311dc87db316d53 100644 (file)
--- a/src/console-kit.c
+++ b/src/console-kit.c
@@ -174,6 +174,49 @@ ck_unlock_session (const gchar *cookie)
     g_object_unref (bus);
 }
 
+void
+ck_activate_session (const gchar *cookie)
+{
+    GDBusConnection *bus;
+    gchar *session_path;
+    GError *error = NULL;
+
+    g_return_if_fail (cookie != NULL);
+
+    g_debug ("Activating ConsoleKit session %s", cookie);
+
+    bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+    if (error)
+        g_warning ("Failed to get system bus: %s", error->message);
+    g_clear_error (&error);
+    if (!bus)
+        return;
+
+    session_path = get_ck_session (bus, cookie);
+    if (session_path)
+    {
+        GVariant *result;
+
+        result = g_dbus_connection_call_sync (bus,
+                                              "org.freedesktop.ConsoleKit",
+                                              session_path,
+                                              "org.freedesktop.ConsoleKit.Session",
+                                              "Activate",
+                                              g_variant_new ("()"),
+                                              G_VARIANT_TYPE ("()"),
+                                              G_DBUS_CALL_FLAGS_NONE,
+                                              -1,
+                                              NULL,
+                                              &error);
+        if (error)
+            g_warning ("Error activating ConsoleKit session: %s", error->message);
+        g_clear_error (&error);
+        if (result)
+            g_variant_unref (result);
+    }
+    g_object_unref (bus);
+}
+
 void
 ck_close_session (const gchar *cookie)
 {

diff --git a/src/console-kit.h b/src/console-kit.h
index b9bd898e73d540b4d58105358383cf328199ec9a..372524477ef8a0de150db603b1c90c5e2f4d9e5a 100644 (file)
--- a/src/console-kit.h
+++ b/src/console-kit.h
@@ -22,6 +22,8 @@ void ck_lock_session (const gchar *cookie);
 
 void ck_unlock_session (const gchar *cookie);
 
+void ck_activate_session (const gchar *cookie);
+
 void ck_close_session (const gchar *cookie);
 
 G_END_DECLS

diff --git a/src/login1.c b/src/login1.c
index 3ddd2ade11d90478e888221e16614da64e670f2c..7f858d6344c9757e6bc4b593150a36b11c8c8522 100644 (file)
--- a/src/login1.c
+++ b/src/login1.c
@@ -136,28 +136,49 @@ login1_unlock_session (const gchar *session_path)
         if (error)
             g_warning ("Error unlocking login1 session: %s", error->message);
         g_clear_error (&error);
-
         if (result)
-        {
             g_variant_unref (result);
+    }
+    g_object_unref (bus);
+}
+
+void
+login1_activate_session (const gchar *session_path)
+{
+    GDBusConnection *bus;
+    GError *error = NULL;
+
+    g_return_if_fail (session_path != NULL);
+
+    g_debug ("Activating login1 session %s", session_path);
+
+    bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+    if (error)
+        g_warning ("Failed to get system bus: %s", error->message);
+    g_clear_error (&error);
+    if (!bus)
+        return;
 
-            result = g_dbus_connection_call_sync (bus,
-                                                  "org.freedesktop.login1",
-                                                  session_path,
-                                                  "org.freedesktop.login1.Session",
-                                                  "Activate",
-                                                  g_variant_new ("()"),
-                                                  G_VARIANT_TYPE ("()"),
-                                                  G_DBUS_CALL_FLAGS_NONE,
-                                                  -1,
-                                                  NULL,
-                                                  &error);
-            if (error)
-                g_warning ("Error activating login1 session: %s", error->message);
-            g_clear_error (&error);
-            if (result)
-                g_variant_unref (result);
-        }
+    if (session_path)
+    {
+        GVariant *result;
+
+        result = g_dbus_connection_call_sync (bus,
+                                              "org.freedesktop.login1",
+                                              session_path,
+                                              "org.freedesktop.login1.Session",
+                                              "Activate",
+                                              g_variant_new ("()"),
+                                              G_VARIANT_TYPE ("()"),
+                                              G_DBUS_CALL_FLAGS_NONE,
+                                              -1,
+                                              NULL,
+                                              &error);
+        if (error)
+            g_warning ("Error activating login1 session: %s", error->message);
+        g_clear_error (&error);
+        if (result)
+            g_variant_unref (result);
     }
     g_object_unref (bus);
 }

diff --git a/src/login1.h b/src/login1.h
index abdf991c55147f574e7c0aa4284aa4df2af23a81..55b9b5db274f1209ef0d1cfe678cd6f47c88f4a2 100644 (file)
--- a/src/login1.h
+++ b/src/login1.h
@@ -24,6 +24,8 @@ void login1_lock_session (const gchar *session_path);
 
 void login1_unlock_session (const gchar *session_path);
 
+void login1_activate_session (const gchar *session_path);
+
 G_END_DECLS
 
 #endif /* _LOGIN1_H_ */

diff --git a/src/seat.c b/src/seat.c
index 8d1e621b223f0a41b65c7289a15d32ccf73a887f..60bfdd3ba2fec7a950354302af8cac2f06a92b18 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -232,6 +232,8 @@ seat_set_active_session (Seat *seat, Session *session)
             session_lock (seat->priv->active_session);
         g_object_unref (seat->priv->active_session);
     }
+
+    session_activate (session);
     seat->priv->active_session = g_object_ref (session);
 }
 
@@ -526,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 (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/src/session.c b/src/session.c
index fdd16d82e4ef946e24460e12f1d3e1dd94863061..1ec2c3e55b8b3c934fbb19b5ab78f63b95b8555f 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -828,6 +828,19 @@ session_unlock (Session *session)
     }
 }
 
+void
+session_activate (Session *session)
+{
+    g_return_if_fail (session != NULL);
+    if (getuid () == 0)
+    {
+        if (session->priv->login1_session)
+            login1_activate_session (session->priv->login1_session);
+        else if (session->priv->console_kit_cookie)
+            ck_activate_session (session->priv->console_kit_cookie);
+    }
+}
+
 void
 session_stop (Session *session)
 {

diff --git a/src/session.h b/src/session.h
index 9be15381cd9a999e94e53f0fe7a691c63e8da411..0618296788d707c79d754f0beb8caa0c48f237f3 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -130,6 +130,8 @@ void session_lock (Session *session);
 
 void session_unlock (Session *session);
 
+void session_activate (Session *session);
+
 void session_stop (Session *session);
 
 gboolean session_get_is_stopping (Session *session);

diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf
index 50b5da67b3c749a7819bdc5439f1db072cc3bb72..b0bd89de32e2169459e6534b1c7852c66e99689c 100644 (file)
--- a/tests/scripts/additional-config-priority.conf
+++ b/tests/scripts/additional-config-priority.conf
@@ -22,6 +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 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 3e05e576a922f7a571975e7ca2c609c66d9a7b25..6efca7da002b0d27fde6bbcd94fe631f3b4dadd0 100644 (file)
--- a/tests/scripts/additional-config.conf
+++ b/tests/scripts/additional-config.conf
@@ -21,6 +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 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 dd591631df342a97e1b907a4fb7c7adbfca357cf..f0926ff04b62ab4a55bbb6ea282d11f6a4c47418 100644 (file)
--- a/tests/scripts/additional-system-config-priority.conf
+++ b/tests/scripts/additional-system-config-priority.conf
@@ -22,6 +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 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 6e1c4fefabe7590603b0777b79804f71a6748175..76a9aa15bfefa2450d97638c5e95e2d60163a1e4 100644 (file)
--- a/tests/scripts/additional-system-config.conf
+++ b/tests/scripts/additional-system-config.conf
@@ -21,6 +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 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 142825c86a45c58c8911fc2bd4ac8c188c7ba8d5..6a81c9a55f26ca2e22f2cd80daae2cb6ad66f4c3 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -24,6 +24,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index f6b07e9779fab6f08408076ff519950eb801953f..955d37f3dfda323f7ef7c3d489f97478e04fdc8e 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -16,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -28,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 9cb515a6162942339496a3f269f02f1fee178c2e..0ea3e1efb85e46397096583c7c7681a2fc3c988b 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -22,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -44,6 +45,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 82c6f245dd3172d3f6549cf5bbee1ddeaf882533..8acc942f7c6b4adeee4a60d862d5e0cae018d593 100644 (file)
--- a/tests/scripts/autologin-guest-session-config.conf
+++ b/tests/scripts/autologin-guest-session-config.conf
@@ -23,6 +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 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 edb6e7e1d96ac2e109ec3469d7e8ce5696b6e15f..30d3964f22c5d5f0ed044cc4edd6c108d05519a4 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -20,6 +20,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -39,6 +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 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 02e97fe9858a51c2ff901e25400bd035195ddb35..ea8cad443853cbf9cfe7b34ebc942438396e613e 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -22,6 +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 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 b6e314ed8f69aa8fe2b263199c196b309fd1cb4a..f97607d1e971c9c49ff3b3a29741ec24b746728d 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -16,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -27,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 5e8d0809a741c13a66d8f9ad3d46a07105834f8f..40f1266b9614ee2cd6fb7fc3bee2bfb6924ba6b4 100644 (file)
--- a/tests/scripts/autologin-invalid-greeter.conf
+++ b/tests/scripts/autologin-invalid-greeter.conf
@@ -19,6 +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 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 d8157704878951de6cd2d36205d90d8df7fa237f..bd480b30689009f5d667864517787dcb285876ea 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -21,6 +21,7 @@ user-session=invalid
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index 5ffda385d743309ec2822a4f36b81e0cd2c1e586..527ce2c6881dc0da8c342a8fa3513547d669d4bc 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -20,6 +20,7 @@ autologin-user=invalid
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index e808a7d8beff80c599e8b46c74b5315dbd6e5236..f58809c99a1cf1fb0fe84bca6226f5ead08965b4 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -38,6 +39,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 10f63e9865fb89afbf18c78b71cbf0932331ebb0..dfa7d83d4025fcc786760c3ac20c3d7aa9e9f767 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index b60662dda776da18d720332f0336cbeddffbefd1..22873bb409cc769c9312b460a98f00ec35a7f7c7 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index 49aa39473268a29d18b19875fc5017adeef8163e..20e9bf99c941bf201b443e9a0c44ea6866b42526 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -18,6 +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 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 0e78ccbb87d2b3c1d4c1363bf0bd500415272b3b..d71b2e41c63eb358434c59663d4ea9a2685c37cc 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -38,6 +39,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 8ab0f907d96899c2783cb5828446c65e0cbcb4e5..743168cbb41e9c91088998345e9af699cfe7dae9 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -32,6 +32,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 1f58e0e3623acbce59ca09ea513044fd908760e0..c4e96d9a1a3f6edcb4e37304162beff02e82b2af 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -17,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -28,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
 
@@ -40,6 +42,7 @@ user-session=default
 #?*GREETER-X-0 START-SESSION
 
 # Switch to existing 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 5fce54dec43ea512c9dcbb66df98e2eff623f3c5..61498fcecf9baa7382b8bbc3409e22a5138148aa 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -20,6 +20,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -36,6 +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 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 3aba87ff4aeda70d97f00686cc65eaf85f3db64d..e33b0132f71b55b9d0c53156680d3d04b0beaf8b 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -36,6 +37,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 26acd32abb9f01e74a5c86a1481710cf89626241..3cde2a5836af5f849a669f2f9e4dc46cff1fb535 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -19,6 +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 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 88bbfffbf69d9d1f0a015130415559a35c6e28b8..371684137c2647d76000ffed0faa519390ea27b2 100644 (file)
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index 94d55ffeaa364056fd35c984ac513d62527a8c99..690ac3d55a7dc5656d9524660220d8aa198fab0c 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index 20424bd2532eef45eb4d5b05a38d9282ee70ef51..f13e76b140a08edceaf302a4f486a08e1f2b59fb 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -22,6 +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 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 faeba7f371b3422a4dfb3b6f233971c27fbb66c8..081edb2c9606f94f839534cada372b96b2ffee0d 100644 (file)
--- a/tests/scripts/corrupt-xauthority.conf
+++ b/tests/scripts/corrupt-xauthority.conf
@@ -19,6 +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 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 a83e70f72271d8222ead3e3c2a2d905a064eabf8..045e5442938e6360bfc967d2a04023dcfbd39362 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 155f774def2c7f07cf135d7c0dad9019cd63dc2b..e5ab6d066341a338bd4c326e0910a663a61a259a 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -32,6 +32,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index 0087c36daf51bedb13964e8bc77f670dc2252240..1c5e1b9fafd24f4c35429e1a27d2f4d215a8fa17 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -32,6 +32,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index dde8fbe3c1e5f0674675205d6b4246dd9819a949..945d906f60dad6093938931cb6d4cc2e615b801c 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -32,6 +32,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
index a569c94583a5248b508f745d6d2693468c766fe5..0bfc6179941418432b1f8311f6906858befe25d5 100644 (file)
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -38,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index bb495999d536997d26aeb9e5a3a2046f37320de6..0044e440764889efb7b253cdf569a3a26f348361 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index de52bcbfebf7592aee8c8c7a68bb4371a4eddedb..9dba5acf73cfffe431d03b08993ad146e353c099 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf
index 59ad3690e1f4d73dd27226ea3a0c25fff80c5139..aca11a4ba40609aa77dcf4d0c3d543052cf643fd 100644 (file)
--- a/tests/scripts/greeter-allow-guest.conf
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -18,6 +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 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 276001de4e9eb249e9e50e40b3e1b4a95aef2d57..5f003e76070e0164cea951011a16f17a5e5621b5 100644 (file)
--- a/tests/scripts/greeter-crash.conf
+++ b/tests/scripts/greeter-crash.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf
index 609bbac67f12762ab9557b93080906ebb1e57a8a..3fcb60343a1c724f97733f8295a66190261d715f 100644 (file)
--- a/tests/scripts/greeter-default-session.conf
+++ b/tests/scripts/greeter-default-session.conf
@@ -18,6 +18,7 @@ user-session=alternative
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index 99ef206a3be5c356efb4aacb1068bf7365dc3f99..03e0ceb8280c6cbfa3071693c913eee5324ac5d5 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -18,6 +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 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 b982188660985141b676089dd770f2e104572d38..5a8f440f1272b1e0c9cc9df90c085c19a92b1cd1 100644 (file)
--- a/tests/scripts/greeter-hide-users.conf
+++ b/tests/scripts/greeter-hide-users.conf
@@ -18,6 +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 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 c9a73383e517c32d900ead2e2ebf535d21ad5c1f..2e969d82577a8706fb2d3e1d1adecb2cc442794f 100644 (file)
--- a/tests/scripts/greeter-show-manual-login.conf
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -18,6 +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 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 27681fa894e002557833833577c75bd1d8678790..fb207233a43957319767fd19e9274e66facecaf4 100644 (file)
--- a/tests/scripts/greeter-show-remote-login.conf
+++ b/tests/scripts/greeter-show-remote-login.conf
@@ -18,6 +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 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 e5d92711ea85f0029af434c14364d544ded8653f..abf36aceaeaf7fc6ab2c2d5eab7e2e4adb6991d8 100644 (file)
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -21,6 +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 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 4105ac5f715f9436a43a5847828c7b49d9d754f5..ec6c332bf20edb6148c5826c1ede5b6a24998589 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -36,6 +37,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 ba14af44d297e1a81f19232db1c6ec1ea1441967..80bc8c0a96e999a5ec412e70411d3073c37ce161 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -19,6 +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 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 fb227469c1058a0b1a42baf7ea570d2197d68996..4a9cfdc2c21a58c99bb5542b345720609ba75d46 100644 (file)
--- a/tests/scripts/guest-wrapper.conf
+++ b/tests/scripts/guest-wrapper.conf
@@ -26,6 +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 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 ddf06a190ec073e8b60ba33fd122aea35663b26f..25bbe299bf70c62afd06d43e2a3f41160a5a7810 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -19,6 +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 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 24b1f590f9ac73cd3ef009e5550673f98124cc60..2739d0d3f5ef3b3b5a3e149d42a5e2fdb5fd5b60 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -19,6 +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 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 e577e70d9ef0b38fe96c8b0fb23a42492ef51b6d..fbfb4d4077099c4140ee769ccb2872ad25dceee7 100644 (file)
--- a/tests/scripts/language-env.conf
+++ b/tests/scripts/language-env.conf
@@ -19,6 +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 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 f1af4f1b33e3a61492a14fbb99f46b629ada6c5c..d4162427837de4f304361432d0a2e78d8b3d11ba 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -18,6 +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 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 c9978d0062598d11b3090f18ed1486089b97819c..19e776aa2ce54322557b192fd40dc780675f8e5d 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
index 6f9e17bc7d0f6299fe9ee26659bf3f387269bcd6..5ca356da22ffe5e000142001f0381f209bdcdf6b 100644 (file)
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -22,6 +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 SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -49,6 +50,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?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 75646879e9ecb5185a63927de3166a0b329477fd..563532a9f68e2590d31974f42a985b676969ff1c 100644 (file)
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -22,6 +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 SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -49,6 +50,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -62,6 +64,7 @@ user-session=default
 #?CONSOLE-KIT UNLOCK-SESSION
 
 # Return to 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 88dba40504d07c147375f399570a37d1fe541501..104ffeb2801806e48a83abb06ea53a427f182af0 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,6 +47,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -59,6 +61,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Return to 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 1fcd0a93302a2c7b57371e097e691066d4f23dfb..537040b9b4aef4141a39a8b21ed5dca5c47174d9 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,6 +47,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?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 21bb2a8144ff6b3303359a2928bcdf84453a87be..80f64292e9cde172787d3b748b003059e396c7b0 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,6 +48,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?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 0af0a6e781dbdf1db549022fe8f145a34b438eb4..fd45d1544a215c145e081e5566b240631ce0cee1 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -34,6 +35,9 @@ user-session=default
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts with session user selected
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
@@ -44,11 +48,9 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
-# Session is locked
-#?LOGIN1 LOCK-SESSION
-
 # Login as existing user
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
 #?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
@@ -60,6 +62,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Return to 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 c8c98c961122ddf4f5cc622c604a61402804383c..db06359ee20e7e0a0250f4e23436342c7f42df6d 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,6 +48,7 @@ user-session=default
 #?GREETER-X-1 LOCK-HINT
 
 # Switch to greeter
+#?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 86bf1c7a870328fde7fdfc6766125b183e25236d..19634a1aef05dbc3008b83f25f4dca5650505253 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index 20a30de451f9063ff321d2bc0886c96c3322b093..6cb33fe9c766fbaf8d5ad5ab3e765fc3cfc95593 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -18,6 +18,7 @@ allow-guest=false
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index dff011897c365566a995b1ed79c03bdc374d6eef..e45fe6dc8ff5d5b9fa30cb6759ce4833fca10468 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -36,6 +37,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 fa7f90827c5b58c31691f7f2fb53f2df0e84ac4f..c88f797129d1c74f71072f82c6178d8053abe32e 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -34,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -56,6 +58,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 d35c10ab64c5a901096e2f2278c7acf97653c2f2..754fdb75b4136a4163b5c8d192b53dd39a8bb626 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -18,6 +18,7 @@ guest-account-script=
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-guest-pick-session.conf b/tests/scripts/login-guest-pick-session.conf
index 7e9de6cee1a684176efa04659c5778db22fd6349..8efe108cc9b4e9bfe86d80fafa5be399eafa538e 100644 (file)
--- a/tests/scripts/login-guest-pick-session.conf
+++ b/tests/scripts/login-guest-pick-session.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -34,6 +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 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 332bc3d446b244137895857bdf62edcbb44dd0b8..0d568fc491afe78321a4798ee49153b65614a136 100644 (file)
--- a/tests/scripts/login-guest-session-config.conf
+++ b/tests/scripts/login-guest-session-config.conf
@@ -19,6 +19,7 @@ guest-session=alternative
 
 # Greeter starts
 #?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
@@ -35,6 +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 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 92604487b49ba9a769bb02536f3eb5c5da07807c..96f50375b86039077ab71b109422ffa0b7f0650f 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -34,6 +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 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 da89e24c5b1858f379f1ee7daf1ea3c3636b8c71..07ea2e932caad40b3b3d417493478771b4410b67 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index 98f934cceb1a4da0dc2685983f8e1125df144dfe..0bab7fe1d92110f176aeb7b87555df632c4e72a3 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index e314b6e17228311803b95bea757ad03014725449..71ba514f70f1864c095ca6c7c548384d1029cd11 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 59aa507e3a6a0e135b028044e7cf6437da6372d9..e28bb5a61355a02df843d508d08b5b1977bb0f64 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -33,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -52,6 +54,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 393c6333041a4e8d1ba93966ea51cfa9553c2eb6..ed69d4561b0b169a03f69273792160c326868bc7 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
index 22ddfb85359900b1bd0a2a5795ef1a217c9b161f..b206a97dfe5f632987f8c24f2a56f059b6eceac1 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index 9e5da5f18593c10071a38ae978a8508f5737e8a4..ee944f2fa4cff1b70128a94f0f313dd6eeb8eca8 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -30,6 +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 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 ae778c94a33961092c8ec71ea8dee4b165c10993..88f348a6f432bf758fcff670c84742c244a15a51 100644 (file)
--- a/tests/scripts/login-manual-remember-session.conf
+++ b/tests/scripts/login-manual-remember-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -30,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -49,6 +51,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -64,6 +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 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 44af56371609976dff32e64a91f0f203c98bfd99..2f067fe3f3a2bdb3b3157e7222fa3a9c36ebae0c 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -35,6 +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 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 d23a4be1b38b15641d8d5768ccf06c1e002ae17f..7b1b5b2e42a01c5c1d91a9275c3c4b81b518d802 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
index 06de79af43404cb57716d1db09d7f929cc803aae..982f5deb750742c5e355501a7a0a9ebd9c001525 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index 7462d8264c69f5124ad4490ed0880c607c87f190..aa706202065418298a21338b355eb44b4518d862 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -33,6 +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 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 fc82e9d2c495f07dc18792dc20d379c4b8fafbbc..ea0dc0e2e1c7346e62dbffab06138d519e750e16 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -31,6 +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 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 390790b023597be2665aa3ced7c5f2f0658bfc6f..49710effb0c1cbaa47eacde42efe08660c7d6965 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -35,6 +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 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 84c85412b9042bf8e042f57cb84731ad142bf0da..89bb7a66657820e51c2516d22affbaeb492212c4 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -28,6 +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 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 802e7c6e7ead26a1ab2566cf7d2113bc9f9893a8..c1836ca6e474df6ae65caa75fa800e973ebb00da 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -28,6 +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 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 066cb0da1013963462986305fa648ad65f99c131..9a9a100cca48440f7ac8fd1f2f4ddbd6193cf487 100644 (file)
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -28,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,6 +49,7 @@
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -60,6 +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 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 340cbcb202345a3e47e2f5887185b94fce539eeb..df6f63e907308f187ced6fb0873c98182f59f8a8 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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
@@ -37,6 +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 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 ab40a2585c7a77d18c0560429d9df2aff897ff87..01d37b706ca584e3b2acd06b03d67702a184b410 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -33,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -52,6 +54,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 845b3f32df2c4911a549c263bda154fabc1f39d1..23f4c28c873a745122541450b67c0746cb10ab76 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index 39a1e1cead462097925566298b256be456a70f97..b96189a590669bbd5ab62e1b48fbf6c58f28901f 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index c7d5fde1cc7f18bdf5def8a5600b978b04d733d8..c19927d16c56bca46db2ff43abdf4a435bea1ea5 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -33,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -50,6 +52,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 d174ac27907a20df94d96ccf9d223bfe67ead21b..29d76b913f53e108b2742c64f265749ddcdb7e4d 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -33,6 +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 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 b913e67f113bd6398a534731cbcaa4aabef4d1e7..0be08e47c45fb21b23a66fc8d3358b2992ef568d 100644 (file)
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -15,6 +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 SESSION=c0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf
index 6b16e6da17e26a16c678231a024e51582f40f365..ed4751a9fde8eb2b3fb19b16c0da1c369723a099 100644 (file)
--- a/tests/scripts/mir-greeter.conf
+++ b/tests/scripts/mir-greeter.conf
@@ -11,6 +11,7 @@
 
 # Greeter starts
 #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 2baa4093231f386e0afd9b34598ce8fa15665abf..2040a14cc318f14a11e25f5b7c4fb95731d8c442 100644 (file)
--- a/tests/scripts/mir-session-compositor-crash.conf
+++ b/tests/scripts/mir-session-compositor-crash.conf
@@ -15,6 +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 SESSION=c0
 
 # Crash system compositor
 #?*UNITY-SYSTEM-COMPOSITOR CRASH
@@ -32,6 +33,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 4e02629f6163fd1bbb9f49bf2c6d2e826cd68739..5d88dd8a39200c1800b53820113928a0504bdcb2 100644 (file)
--- a/tests/scripts/mir-session-crash.conf
+++ b/tests/scripts/mir-session-crash.conf
@@ -15,6 +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 SESSION=c0
 
 # Crash session
 #?*SESSION-MIR-session-0 CRASH
@@ -32,6 +33,7 @@ user-session=mir
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 0a832ca09e36fc692406ef24c9a18ac881acd300..35d794f34f697a1e48e165ce33bf92477c3b7072 100644 (file)
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -18,6 +18,7 @@ user-session=mir
 
 # Greeter starts
 #?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
@@ -41,6 +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 SESSION=c1
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/multi-seat.conf b/tests/scripts/multi-seat.conf
index f674cc0d333f8f8c84f1b5d7f43670df260802f0..1fc306973b9028e5c8f9c7b006631b5922cc469d 100644 (file)
--- a/tests/scripts/multi-seat.conf
+++ b/tests/scripts/multi-seat.conf
@@ -17,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -28,6 +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 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 78e6949db48a0a3f7ec4557376a53c78be066040..4735230e7a581b8bdcaafb00302fe2b44700b342 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -22,6 +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 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 e2eb445261aa890f5347b2465f2a7cb98ea04035..7250f96cb4dd392bd3d8eaed6b6c793160a093c3 100644 (file)
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -18,6 +18,7 @@ have-config=false
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index af3b1ebdab58bc2be50d1a1bed3288ac33744fdc..63ca37280e5dd6b40a9a5d5f26258e08b4013476 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -22,6 +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 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 56af6e6d8babd1f76ed3845f601139214d2fc6ed..533e40f6ba89043d56a6860abf7310e5a83daea4 100644 (file)
--- a/tests/scripts/no-login1.conf
+++ b/tests/scripts/no-login1.conf
@@ -22,6 +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 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 83b9198d3033547aed324b095e2a30dee99d8eb1..e4a4c5a8aeb0c9328c40c4784fe14e0af517756b 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -19,6 +19,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -34,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 451c31f94e16d385948d7e8b6962901135e0198a..21cfeebd939d7fe57c6236e4da3b8ea0dd1a8e28 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -19,6 +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 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 5013988acbea6c8c36a9c63b8a52d23dc4934ef2..e7da8a828f4827f1cd68b85ab2f40da774c35102 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -28,6 +28,7 @@ active=true
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index 655f0b174934909d9ba395de74c9cf7a195c6c98..754cd049c412dac97bcdbb681780c75c018c0605 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -22,6 +22,7 @@ active=true
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index 6a5d2b303154e1a1a559b07578786c1818d4dd46..9d3b6060b9cb1f9547eec5740d609f7871433700 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -18,6 +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 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 28bcb83b7e9fd0df42856df410879ea4322f10c2..79df9b4c9ddac539239f259f66bd10cf06e51422 100644 (file)
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -18,6 +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 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 fc6b7b19bf5577147ffcff48c59e6ff64b311ffc..e84d0b981e80e2b73df9e906faa62bd5a5f73a36 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index c1614cb4d4faf736e558337be66a92613b913cb8..78e955103d9f26f3ad49ec6c6053162a9c7d25da 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/script-hook-session-setup-fail.conf b/tests/scripts/script-hook-session-setup-fail.conf
index 9e3922f4f21e2e3582e5a2f93d67bb2a33fd91d6..de856ae1168d535225279dac6a593a3653b530e0 100644 (file)
--- a/tests/scripts/script-hook-session-setup-fail.conf
+++ b/tests/scripts/script-hook-session-setup-fail.conf
@@ -23,6 +23,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/script-hook-session-setup-missing.conf b/tests/scripts/script-hook-session-setup-missing.conf
index c6550004d44cadc39bf4658263471d5bdc6c2550..4e359330b818d2c5ab3cd2860ff91c439afc1b7e 100644 (file)
--- a/tests/scripts/script-hook-session-setup-missing.conf
+++ b/tests/scripts/script-hook-session-setup-missing.conf
@@ -22,6 +22,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 10668606255e71bc06f090b26ccc96721d71fa34..9b1b2af6bcf5af3d0908b889af7a8e2af705d290 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -28,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -57,6 +58,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 0270f2956f3e42a4cc2f811426f7fd51719abd8c..6100bbd8048eb9ffda14269601ba9d4b77055505 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -35,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -44,6 +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 SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -64,6 +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 SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -73,6 +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 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 26c1e36b4f5dd3fd6ef97836970579f3c0df73d2..2eb9af30583245fd91e95af490a181d3ffd54ab0 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -19,6 +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 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 40d7eaa38f778bc0f026b1ee92e477a810b89e6c..006c81136c3ade52c1846ba532f2945a777456fb 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -19,6 +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 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 7a9aee950a721f3d542decf4e5903fe7b55e58c3..6367b550acb5ae391f1d7f76d71852e7376ca100 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -19,6 +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 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 161c735469cb33dd180519f31f809fbb38231573..4b60d80dda6cb22f74a86ca1144c8cef72a4dec0 100644 (file)
--- a/tests/scripts/shared-data-greeter-to-session.conf
+++ b/tests/scripts/shared-data-greeter-to-session.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -35,6 +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 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 730528db70b17beacbd22e6b7a1d77c3bd71c2b6..09fc277f9010ca386c3a9c01d5ec150dd87a6b8c 100644 (file)
--- a/tests/scripts/shared-data-invalid-user.conf
+++ b/tests/scripts/shared-data-invalid-user.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/shared-data-session-to-greeter-autologin.conf b/tests/scripts/shared-data-session-to-greeter-autologin.conf
index 8ca399e4595a9718dded459755e34b6f52711bf9..ca999022e603c2c5463f50fa8919cdbf26733e0d 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter-autologin.conf
+++ b/tests/scripts/shared-data-session-to-greeter-autologin.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -42,6 +43,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 a7634a1f5b4314f7ce25ebf40c5fdfa110810239..0c76e2fb055e9e1d2ca4c772865c0c9778f16c50 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter.conf
+++ b/tests/scripts/shared-data-session-to-greeter.conf
@@ -18,6 +18,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -31,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -54,6 +56,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 ada7ccc72cf25a84b4893791d21a7d5eb1abfccf..9ddb76f61e6eca1394787ea704fe63fc8eaaded2 100644 (file)
--- a/tests/scripts/surfaceflinger-autologin.conf
+++ b/tests/scripts/surfaceflinger-autologin.conf
@@ -12,6 +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 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 90fa3fad7e2172aa330e01ff9799e101da42a47c..d43ef18d262db798687afe436e9a1a53ca226e63 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,6 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login
@@ -57,6 +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 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 071d71cd9ea8fe963ee2ca2ac5bd9a69c8ae5551..f41941d4a6316699288aab83fa78a6550e866111 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,6 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -58,6 +60,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?VT ACTIVATE VT=7
 
 # Greeter and X server stop
@@ -76,6 +79,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 f26a3a7751bae7ac6a4fdbedf9367f30e60af67b..9d8ae2ce524a81b71ed2a20e9776ef42995624da 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,6 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Login as existing user
@@ -58,6 +60,7 @@ user-session=default
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to 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 8cf35ee18e9555242ccb231fd6061f010069cccd..2791aca81f4384fda656f9d17230162069fb324d 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -19,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -45,6 +46,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?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 234b5631649003d8b73ef7e38fe2b1f32c6688f0..58856c827fe62295d52583e146b592475e94e21b 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -38,9 +39,6 @@ user-session=default
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
-# Switch to session
-#?VT ACTIVATE VT=8
-
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
@@ -49,9 +47,14 @@ user-session=default
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
+# Switch to 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 SESSION=c1
 #?*WAIT
 
 # Cleanup

diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf
index 94227c2c44eb4b9805db1ba2291fe07e25f3f681..c65233d7f1bd214ee144aa81302331676c041a07 100644 (file)
--- a/tests/scripts/switch-to-user-active.conf
+++ b/tests/scripts/switch-to-user-active.conf
@@ -20,6 +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 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 e0393609fe89ed8d6806d7d908e0bc8d5254550f..8222d1f2619729540479405a4f424e396c2b2a70 100644 (file)
--- a/tests/scripts/switch-to-user-existing-no-password.conf
+++ b/tests/scripts/switch-to-user-existing-no-password.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -44,6 +45,7 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Switch back to first user
@@ -57,6 +59,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Switch to first 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 6a29c157ef52c1075018513e4ad22290b1532a02..d7a69fcd8b7d8d12f4da150dfe451ff32eed8c21 100644 (file)
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -44,6 +45,7 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Switch back to first user
@@ -58,6 +60,9 @@ user-session=default
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
 
+# New session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter
 #?XSERVER-2 ACCEPT-CONNECT
@@ -67,6 +72,7 @@ user-session=default
 #?GREETER-X-2 SELECT-USER-HINT USERNAME=have-password1
 
 # Switch to greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?VT ACTIVATE VT=9
 
 # Log into new account
@@ -80,13 +86,11 @@ user-session=default
 # Greeter X server terminates
 #?XSERVER-2 TERMINATE SIGNAL=15
 
-# New session is locked
-#?LOGIN1 LOCK-SESSION
-
 # Old session is unlocked
 #?LOGIN1 UNLOCK-SESSION
 
 # Switch to first 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 6a01ee411e67773ecc3cb942e5d666b7c3edeca1..e27af5b5e77403e73e44a2e56a5bac803b472466 100644 (file)
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -44,6 +45,7 @@ user-session=default
 #?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to new session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?VT ACTIVATE VT=8
 
 # Log out new session
@@ -60,6 +62,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
+#?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 c7be4b3d2d825ce38c2fbcf18a7382cd61132d23..7f53bab482b69075a08cf35b721e8b8dda1e54a0 100644 (file)
--- a/tests/scripts/switch-to-user-logout-inactive.conf
+++ b/tests/scripts/switch-to-user-logout-inactive.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -44,6 +45,7 @@ user-session=default
 #?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 c910174b0693581a8454330088321c1ff5d20c28..608b983238fdde82c33db341eb6abadc3186d83b 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -38,14 +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
 #?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 8652909ae8a34d64e873459e7154054fd1720337..4647076b17d7d67897a636de493c225c50f16b57 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -46,6 +47,7 @@ user-session=default
 #?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 8aa7a74eda5713086f56891ce603f5f0d33cc4a5..2c50c39676ffdb2d46e081873e291cd4b1d28afc 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -20,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -38,14 +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
 #?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
@@ -58,9 +60,6 @@ user-session=default
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
 
-# Switch to session
-#?VT ACTIVATE VT=9
-
 # Session is locked
 #?LOGIN1 LOCK-SESSION
 
@@ -69,6 +68,10 @@ user-session=default
 #?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 5f4648e654379a322d0a6b6dbfd008c0934514e2..fd16d65bf498b009987eac2542be2019588fa0da 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -22,6 +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 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 2278707af8543372ee63c18fcd432d96227cc447..b1998993f46ce16f989ecb9d446ae303ac761aa9 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -24,6 +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 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 c887eb6eacb29f1ec16beb3464f5217d69e79fbe..49612e85bbd4fa36a295a05c6aa2d3b97f0e7649 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -24,6 +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 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 a119a1d8927d258df066f30986599ff22449a271..c9ffc6e05853144b67d9802a95d62922d836d6f8 100644 (file)
--- a/tests/scripts/unity-compositor-crash.conf
+++ b/tests/scripts/unity-compositor-crash.conf
@@ -22,6 +22,7 @@ type=unity
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf
index 6d69c24113a830e970e12f127b038d3c7c1c2cc3..4ceb1369ae2913437346be327bec65dfd88cc305 100644 (file)
--- a/tests/scripts/unity-compositor-fallback.conf
+++ b/tests/scripts/unity-compositor-fallback.conf
@@ -29,6 +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 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 9c59f65d3f0b8e1e0bad9d625262de93d133f2e0..720f99b3cd236bf52988472bdcdd3f35de880c52 100644 (file)
--- a/tests/scripts/unity-compositor-mir-next-session.conf
+++ b/tests/scripts/unity-compositor-mir-next-session.conf
@@ -17,11 +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 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 d71f5addac1cf73db1ac1a9eb69ba5ee2ff58a4e..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,6 +33,7 @@ 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
 

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index 141df0a5ebce257b222007a62fa4e89c2da75fee..fb0cc943c4937e6f65a8171787d6ec9ad466bb25 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -23,6 +23,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -41,6 +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 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 326077f3c87a9fb0364ffe84984908a2cfa8aa77..d09aec3985910a40e0912de74026a492e865c294 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -16,6 +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 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 3a9f5a4771d4071902025e7ec1bc3fb88db7d065..0c8e29ebce4485484fba672d2d9df45d570e766a 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -15,6 +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 SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
@@ -28,6 +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 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 899d02be58b45f2f9311504f3485927e7c54f254..0927a186ab158118452f0c56f943c471e62cbc72 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -15,6 +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 SESSION=c0
 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
@@ -36,6 +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 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 7fa3e1d57acfff5bbf00f48d5cbcff57bed2fc8e..1593249a0adefa19bac0586fe9c790fe3def1d7a 100644 (file)
--- a/tests/scripts/unity-mir-lock-seat.conf
+++ b/tests/scripts/unity-mir-lock-seat.conf
@@ -16,6 +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 SESSION=c0
 
 # System compositor switches to session
 #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
@@ -29,6 +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 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 985f5e83571c94d9fd458c4d19ae4d0fe47a7b17..c7c0d074830b2c3dcf11ce9063175881de3a5d16 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -23,6 +23,7 @@ user-session=mir
 
 # Greeter starts
 #?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
@@ -38,6 +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 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 725010de8dab975716dea6ccc6ad24ced2c1fb82..fa236a0d82addb3ad3baf45334470220084bd2b4 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -34,6 +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 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 ccc9ca7218043e286056e4e358668e866f2e953e..72c729428ddca72b6ced46ff991ed4af58d5349a 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -24,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,6 +48,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -65,6 +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 SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -80,6 +83,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 4c2466cb91ec513d77f070b29d75361c1d08d59a..48260d05d7206c7fddf160c39b5090471e303a65 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -25,6 +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 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 ee27a5ac464feabcc8c0b127deccb5f41e1a332f..2dd11558235eb6cef2b735333b4259efec964649 100644 (file)
--- a/tests/scripts/upstart-autologin.conf
+++ b/tests/scripts/upstart-autologin.conf
@@ -25,6 +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 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 94fff8ee7baa69e9159131020ce8708cbf3faddf..70d9587e559549ab62d6e84177bf6bb55ffaf874 100644 (file)
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -23,6 +23,7 @@ report-events=true
 
 # Greeter starts
 #?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
@@ -40,6 +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 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 baacb59c37174c023bb6e1a9dd9e65245fe47a83..245362c350e83bb0de82126a96d8c47e3e73da2f 100644 (file)
--- a/tests/scripts/user-background.conf
+++ b/tests/scripts/user-background.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-has-messages.conf b/tests/scripts/user-has-messages.conf
index 80d8718a7fd446dc1b83b2662099c85e1325bb82..a5dc9d47f0bdfe89bdc98f565458d8a0bfa5f2cb 100644 (file)
--- a/tests/scripts/user-has-messages.conf
+++ b/tests/scripts/user-has-messages.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-image.conf b/tests/scripts/user-image.conf
index 5787b492bc9737996b68420b10b81e5733537fab..d91e9f77c7d56d5eb3ebaf7069b7f59742178e53 100644 (file)
--- a/tests/scripts/user-image.conf
+++ b/tests/scripts/user-image.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-layout.conf b/tests/scripts/user-layout.conf
index 3e0a297fe633266e56569c37162d04ee80eac672..0abce2cfef1219e7a6fade30e74498f688692737 100644 (file)
--- a/tests/scripts/user-layout.conf
+++ b/tests/scripts/user-layout.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-logged-in.conf b/tests/scripts/user-logged-in.conf
index 006ec0d2ffd98e77b915a6e614736aadd31b60b0..8f22cdebfa2fcfc8983abc70ec0f93e8f35c0ea4 100644 (file)
--- a/tests/scripts/user-logged-in.conf
+++ b/tests/scripts/user-logged-in.conf
@@ -21,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -38,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -64,6 +66,7 @@ log-user-changes=true
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Switch to greeter
+#?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 39ddd2c0bbfb32ecc8d0f0cc4a1017e667867032..e44c3042f68e55718d1729c8e8eb29e687a3d03f 100644 (file)
--- a/tests/scripts/user-name.conf
+++ b/tests/scripts/user-name.conf
@@ -15,6 +15,7 @@
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index a2e83158d41de745c4602cc23b8a2f8bf819372b..c17ceddc99df6c1acd5f62ec628d55f10a2a7636 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 9902c81f4604f159c3fe0ce093e2be8dfef493eb..22eafb4df93a24c95ffabb50c2b8eee92871ef4c 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -19,6 +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 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 18d19b5a792fcad95aacaabe3908d98dbd19d1f4..72224276c57c52ffc3392e4a6c9c6405d5700f57 100644 (file)
--- a/tests/scripts/user-session.conf
+++ b/tests/scripts/user-session.conf
@@ -21,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -38,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -55,6 +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 SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -83,6 +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 SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf
index 9d3284a00b8c5dc1ff562c782150998f4e94a8fa..020aaf9505794445ce226a2a4bb175a0121be174 100644 (file)
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -21,6 +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 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 1970523165b5d93a44d6ff992504f46c444326bc..71404e761e30f66d851d81ebb277f0a1c4fc99ec 100644 (file)
--- a/tests/scripts/utmp-autologin.conf
+++ b/tests/scripts/utmp-autologin.conf
@@ -26,6 +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 SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -49,6 +50,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 29078f78e196979e7eb8a168130a4251042365e6..430fd208ca02578542e94a7b0f575dc68baa3f15 100644 (file)
--- a/tests/scripts/utmp-login.conf
+++ b/tests/scripts/utmp-login.conf
@@ -21,6 +21,7 @@ user-session=default
 
 # Greeter starts
 #?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
@@ -40,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -63,6 +65,7 @@ user-session=default
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?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 ef15172abc87fbfcf362f06d7aec058dde63899a..b909075260780999a375a4a4d896c2159a49b082 100644 (file)
--- a/tests/scripts/utmp-wrong-password.conf
+++ b/tests/scripts/utmp-wrong-password.conf
@@ -18,6 +18,7 @@ check-events=true
 
 # Greeter starts
 #?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

diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
index 78bb5b55a8a20e2a75be355da7db34b45da727c6..a99cec7b0e22a49cc266af006493579f606c7f6d 100644 (file)
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -34,6 +34,7 @@ command=Xvnc -option
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
+#?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 b108443946540267e293f70da13aa30aea4f2130..e1edba07139ad75945bbce4ab53c619457fb0f22 100644 (file)
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -36,6 +36,7 @@ depth=16
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
+#?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 8333644bf508752232cc685e75d99359152830c6..def7cfe0770e29d0dd5f87b87aadd9f4984cb57e 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -38,6 +38,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -53,6 +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 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 f2c3d9d1ce1d0750a611ed10ad52a2e0519dfce2..ce54a3935896028e5aad723127547bfdf64cfbce 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -37,6 +37,7 @@ user-session=default
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -52,6 +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 SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index ed85490b4ed101ff64451769dcb856e140a4e84c..4aeeac22936ff49328c08086b490102ddfb64ef3 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -19,6 +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 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 8dd720643ef2f40fcaf99d08c50b5555d5c1a2c2..9e2a23b9db35832e54253aa3a0644ab60289eee5 100644 (file)
--- a/tests/scripts/xdg-current-desktop.conf
+++ b/tests/scripts/xdg-current-desktop.conf
@@ -19,6 +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 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 d738cb57aae7f7cbdd9dbada9ef78813a9c26baf..c8188546f08d2a59a661dc7baa06b186306998b8 100644 (file)
--- a/tests/scripts/xdg-seat.conf
+++ b/tests/scripts/xdg-seat.conf
@@ -20,6 +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 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 86b4344ba33aed0ac60611bf1ddc84c201652a3b..590639ed04e56a30b5963ec882d5ee536d4a41a6 100644 (file)
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -35,6 +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 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
@@ -50,6 +51,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
+#?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 64141b5614286e4fe33e71b1b1c5831708e9d3b2..aa55db0e814c1f971b4802cffa8c1d1d67b3a500 100644 (file)
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -35,6 +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 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
@@ -50,6 +51,7 @@ user-session=default
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
+#?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 0ab48b9df92c09f65535f32eb891a5ee1baee17b..41a9f8aea47f8817f9161d6f14d5a4a33f4aa255 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -19,6 +19,7 @@ xserver-share=false
 
 # Greeter starts
 #?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
@@ -45,6 +46,7 @@ xserver-share=false
 #?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 3480414d8c26a70ed3b2d038585aa149cdb437b6..30f2fef7677c224c3737fc0e863f2c56da0c18c4 100644 (file)
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -1109,7 +1109,7 @@ handle_ck_call (GDBusConnection       *connection,
         for (link = ck_sessions; link; link = link->next)
         {
             CKSession *session = link->data;
-            if (strcmp (session->cookie, cookie) != 0)
+            if (strcmp (session->cookie, cookie) == 0)
             {
                 g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", session->path));
                 return;
@@ -1158,6 +1158,14 @@ handle_ck_session_call (GDBusConnection       *connection,
         session->locked = FALSE;
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
     }
+    else if (strcmp (method_name, "Activate") == 0)
+    {
+        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
         g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
 }
@@ -1210,6 +1218,7 @@ ck_name_acquired_cb (GDBusConnection *connection,
         "  <interface name='org.freedesktop.ConsoleKit.Session'>"
         "    <method name='Lock'/>"
         "    <method name='Unlock'/>"
+        "    <method name='Activate'/>"
         "  </interface>"
         "</node>";
     GDBusNodeInfo *ck_info;
@@ -1285,6 +1294,14 @@ handle_login1_session_call (GDBusConnection       *connection,
         session->locked = FALSE;
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
     }
+    else if (strcmp (method_name, "Activate") == 0)
+    {
+        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
         g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
 }
@@ -1302,6 +1319,7 @@ open_login1_session (GDBusConnection *connection,
         "  <interface name='org.freedesktop.login1.Session'>"
         "    <method name='Lock'/>"
         "    <method name='Unlock'/>"
+        "    <method name='Activate'/>"
         "  </interface>"
         "</node>";
     static const GDBusInterfaceVTable login1_session_vtable =