diff options
181 files changed, 403 insertions, 29 deletions
diff --git a/src/console-kit.c b/src/console-kit.c index 3c261ca1..41ffbc49 100644 --- a/src/console-kit.c +++ b/src/console-kit.c @@ -175,6 +175,49 @@ ck_unlock_session (const gchar *cookie) } 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) { GDBusConnection *bus; diff --git a/src/console-kit.h b/src/console-kit.h index b9bd898e..37252447 100644 --- 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 3ddd2ade..7f858d63 100644 --- 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 abdf991c..55b9b5db 100644 --- 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_ */ @@ -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); } diff --git a/src/session.c b/src/session.c index fdd16d82..1ec2c3e5 100644 --- a/src/session.c +++ b/src/session.c @@ -829,6 +829,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) { g_return_if_fail (session != NULL); diff --git a/src/session.h b/src/session.h index 9be15381..06182967 100644 --- 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 50b5da67..658c1b28 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index 3e05e576..e8654eae 100644 --- 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 #?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 dd591631..44393bba 100644 --- 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 #?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 6e1c4fef..ffdb8a65 100644 --- 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 #?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 142825c8..a95ec231 100644 --- 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 #?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 f6b07e97..9a950b8f 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index 9cb515a6..cab64a30 100644 --- 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 #?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 #?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 82c6f245..bd68c876 100644 --- 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 #?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 edb6e7e1..4aecdd61 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index 02e97fe9..7e468230 100644 --- 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 #?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 b6e314ed..85d15be1 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff --git a/tests/scripts/autologin-invalid-greeter.conf b/tests/scripts/autologin-invalid-greeter.conf index 5e8d0809..a7a61cac 100644 --- 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 #?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 d8157704..f1a6b88b 100644 --- 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 #?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 5ffda385..2a431328 100644 --- 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 #?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 e808a7d8..47e7cfc2 100644 --- 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 #?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 #?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 10f63e98..13e70ea9 100644 --- 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 #?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 b60662dd..b7e21797 100644 --- 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 #?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 49aa3947..7b4639b6 100644 --- 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 #?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 0e78ccbb..c78bf5ba 100644 --- 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 #?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 #?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 8ab0f907..2dacd1db 100644 --- 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 #?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 1f58e0e3..7bd534d5 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -40,6 +41,7 @@ user-session=default #?*GREETER-X-0 START-SESSION # Switch to existing session +#?LOGIN1 ACTIVATE-SESSION #?VT ACTIVATE VT=8 # Quit greeter diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 5fce54de..6ed7258f 100644 --- 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 #?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 #?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 3aba87ff..6d3c29f5 100644 --- 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 #?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 #?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 26acd32a..40c9ab22 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf index 88bbfffb..4093b7fd 100644 --- 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 #?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 94d55ffe..4e03ae2b 100644 --- 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 #?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 20424bd2..f2bf0dab 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/corrupt-xauthority.conf b/tests/scripts/corrupt-xauthority.conf index faeba7f3..ed333537 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index a83e70f7..b0b195a8 100644 --- 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 #?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 155f774d..3378764d 100644 --- 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 #?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 0087c36d..e737ea88 100644 --- 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 #?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 dde8fbe3..380d71f7 100644 --- 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 #?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 a569c945..8d9517c5 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index bb495999..7ca5f850 100644 --- 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 #?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 de52bcbf..35ce86b1 100644 --- 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 #?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 59ad3690..fcf56fbd 100644 --- 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 #?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 276001de..ba9702d5 100644 --- 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 #?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 609bbac6..2a2fdaf8 100644 --- 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 #?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 99ef206a..295a1528 100644 --- 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 #?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 b9821886..861bf55c 100644 --- 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 #?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 c9a73383..1b172ddf 100644 --- 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 #?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 27681fa8..591b7229 100644 --- 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 #?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 e5d92711..a0c39f00 100644 --- 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 #?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 4105ac5f..0c90d1d9 100644 --- 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 #?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 #?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 ba14af44..9b82d7b8 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/guest-wrapper.conf b/tests/scripts/guest-wrapper.conf index fb227469..b5fd6104 100644 --- 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 #?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 ddf06a19..9620aaf2 100644 --- 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 #?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 24b1f590..6401c2fa 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf index e577e70d..34129f33 100644 --- 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 #?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 f1af4f1b..a3158732 100644 --- 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 #?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 c9978d00..8b32c5ab 100644 --- 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 #?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 6f9e17bc..2b8518a4 100644 --- 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 #?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 #?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 75646879..e799bd2f 100644 --- 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 #?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 #?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 #?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 88dba405..51e70655 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Login as existing user @@ -59,6 +61,7 @@ user-session=default #?LOGIN1 UNLOCK-SESSION # Return to session +#?LOGIN1 ACTIVATE-SESSION #?VT ACTIVATE VT=7 # Greeter and X server stop diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index 1fcd0a93..64a2ba37 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Cleanup diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 21bb2a81..42bbf55c 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Cleanup diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 0af0a6e7..1517e271 100644 --- 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 #?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 #?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 #?VT ACTIVATE VT=7 # Greeter and X server stop diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index c8c98c96..c0808e1c 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Cleanup diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf index 86bf1c7a..1c725de1 100644 --- 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 #?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 20a30de4..7b3e195a 100644 --- 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 #?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 dff01189..d5b007c7 100644 --- 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 #?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 #?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 fa7f9082..dc64dbf6 100644 --- 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 #?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 #?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 #?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 d35c10ab..7dddbb8a 100644 --- 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 #?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 7e9de6ce..0ee36d38 100644 --- 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 #?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 #?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 332bc3d4..ab903d41 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 92604487..c5b13c53 100644 --- 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 #?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 #?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 da89e24c..cccc5721 100644 --- 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 #?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 98f934cc..ce2381c4 100644 --- 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 #?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 e314b6e1..e76b40ed 100644 --- 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 #?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 59aa507e..0af754aa 100644 --- 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 #?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 #?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 #?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 393c6333..f6bef23a 100644 --- 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 #?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 22ddfb85..8a1646c6 100644 --- 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 #?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 9e5da5f1..05d1e7cc 100644 --- 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 #?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 #?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 ae778c94..91dbaa18 100644 --- 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 #?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 #?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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 44af5637..95c33a1a 100644 --- 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 #?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 #?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 d23a4be1..5d6ca6d1 100644 --- 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 #?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 06de79af..94b9c168 100644 --- 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 #?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 7462d826..ab681464 100644 --- 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 #?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 #?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 fc82e9d2..6143cf46 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 390790b0..ec971d44 100644 --- 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 #?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 #?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 84c85412..8348a47c 100644 --- 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 #?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 #?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 802e7c6e..d26c6fb5 100644 --- 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 #?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 #?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 066cb0da..9f6bd377 100644 --- 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 #?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 #?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 #?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 #?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 340cbcb2..475fefa0 100644 --- 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 #?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 #?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 ab40a258..3e7bb527 100644 --- 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 #?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 #?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 #?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 845b3f32..149d4dc6 100644 --- 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 #?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 39a1e1ce..e510a55e 100644 --- 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 #?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 c7d5fde1..6951c2b3 100644 --- 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 #?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 #?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 #?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 d174ac27..91085cf7 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf index b913e67f..6a39e3de 100644 --- 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 # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf index 6b16e6da..b270fe98 100644 --- 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 #?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 2baa4093..eab24b08 100644 --- 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 # 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 #?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 4e02629f..1af41f30 100644 --- 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 # 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 #?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 0a832ca0..a9e772b9 100644 --- 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 #?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 # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/multi-seat.conf b/tests/scripts/multi-seat.conf index f674cc0d..50e15720 100644 --- 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 #?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 #?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 78e6949d..b2637f9d 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf index e2eb4452..9724830d 100644 --- 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 #?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 af3b1ebd..969e722f 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index 56af6e6d..df3a4ba0 100644 --- 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 #?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 83b9198d..338fc0ac 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index 451c31f9..09463831 100644 --- 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 #?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 5013988a..fc8db6ac 100644 --- 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 #?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 655f0b17..353a40a4 100644 --- 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 #?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 6a5d2b30..1bd80a41 100644 --- 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 #?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 28bcb83b..ea12d519 100644 --- 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 #?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 fc6b7b19..02bf4697 100644 --- 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 #?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 c1614cb4..802e2a19 100644 --- 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 #?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 9e3922f4..78d99f1f 100644 --- 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 #?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 c6550004..e5aaa7fd 100644 --- 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 #?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 10668606..61f0c64f 100644 --- 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 #?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 #?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 0270f295..a3df873e 100644 --- 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 #?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 #?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 #?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 #?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 #?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 26c1e36b..4cf2fd45 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 40d7eaa3..68635a16 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index 7a9aee95..14e1de95 100644 --- 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 #?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 161c7354..d7b21318 100644 --- 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 #?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 #?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 730528db..1a459caa 100644 --- 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 #?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 8ca399e4..0d1018b3 100644 --- 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 #?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 #?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 a7634a1f..1807d9a6 100644 --- 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 #?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 #?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 #?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 ada7ccc7..61e65d98 100644 --- 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 # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 90fa3fad..fc8f2301 100644 --- 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 #?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 #?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 #?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 071d71cd..1ed69c65 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Login as existing user @@ -58,6 +60,7 @@ user-session=default #?LOGIN1 UNLOCK-SESSION # Switch to session +#?LOGIN1 ACTIVATE-SESSION #?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 #?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 f26a3a77..94c90d2f 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Login as existing user @@ -58,6 +60,7 @@ user-session=default #?LOGIN1 UNLOCK-SESSION # Switch to session +#?LOGIN1 ACTIVATE-SESSION #?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 8cf35ee1..060ce766 100644 --- 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 #?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 #?VT ACTIVATE VT=8 # Cleanup diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index 234b5631..f63e7490 100644 --- 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 #?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 +#?VT ACTIVATE VT=8 + # Switch again, should not do anything as guest already running #?*SWITCH-TO-GUEST #?RUNNER SWITCH-TO-GUEST +#?LOGIN1 ACTIVATE-SESSION #?*WAIT # Cleanup diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf index 94227c2c..5aa61c4b 100644 --- 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 #?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 e0393609..1395e9af 100644 --- 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 #?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 #?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 #?VT ACTIVATE VT=7 # Cleanup diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf index 6a29c157..9feb1e3c 100644 --- 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 #?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 #?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 #?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 #?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 6a01ee41..4d9b72e6 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -40,6 +41,7 @@ user-session=default # Session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER @@ -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 #?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 c7be4b3d..ec82891d 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -40,6 +41,7 @@ user-session=default # Session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index c910174b..20a3d17f 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -43,6 +44,7 @@ user-session=default # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index 8652909a..cf3a2120 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -40,6 +41,7 @@ user-session=default # Greeter starts #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index 8aa7a74e..dd25d5f7 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -43,6 +44,7 @@ user-session=default # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER @@ -66,6 +68,7 @@ user-session=default # New session starts #?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-2 ACCEPT-CONNECT #?SESSION-X-2 CONNECT-XSERVER diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 5f4648e6..0762345c 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index 2278707a..5e79b897 100644 --- 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 #?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 c887eb6e..d445c98d 100644 --- 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 #?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 a119a1d8..1ea002a0 100644 --- 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 #?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 6d69c241..8b8e3a7a 100644 --- 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 #?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 9c59f65d..bc518a37 100644 --- a/tests/scripts/unity-compositor-mir-next-session.conf +++ b/tests/scripts/unity-compositor-mir-next-session.conf @@ -17,6 +17,7 @@ autologin-in-background=true # Greeter session #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf index d71f5add..dca64337 100644 --- a/tests/scripts/unity-compositor-next-session.conf +++ b/tests/scripts/unity-compositor-next-session.conf @@ -36,6 +36,7 @@ autologin-in-background=true #?SESSION-X-1 CONNECT-XSERVER # System compositor switches to greeter +#?LOGIN1 ACTIVATE-SESSION #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0 # Switch to user without a session diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index 141df0a5..f677c168 100644 --- 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 #?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 #?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 326077f3..3d0cb947 100644 --- 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 # 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 3a9f5a47..417fc987 100644 --- 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 #?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 # 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 899d02be..70df57e2 100644 --- 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 #?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 #?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 7fa3e1d5..635a9e58 100644 --- 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 # 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 #?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 985f5e83..19ac643b 100644 --- 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 #?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 # 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 725010de..b8a1657f 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index ccc9ca72..c2d23715 100644 --- 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 #?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 #?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 #?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 #?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 4c2466cb..bfe43880 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf index ee27a5ac..46298af3 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf index 94fff8ee..f1143e5d 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/user-background.conf b/tests/scripts/user-background.conf index baacb59c..d0373971 100644 --- 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 #?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 80d8718a..658e1840 100644 --- 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 #?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 5787b492..9f18d9b6 100644 --- 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 #?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 3e0a297f..6bfd3471 100644 --- 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 #?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 006ec0d2..a632c5ed 100644 --- 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 #?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 #?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 #?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 39ddd2c0..d0903ed5 100644 --- 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 #?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 a2e83158..5fd94b05 100644 --- 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 #?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 9902c81f..3d95f470 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/user-session.conf b/tests/scripts/user-session.conf index 18d19b5a..5591a8c2 100644 --- 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 #?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 #?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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf index 9d3284a0..30161dbd 100644 --- 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 #?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 19705231..2898b570 100644 --- 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 #?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 #?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 29078f78..4738a90b 100644 --- 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 #?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 #?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 #?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 ef15172a..6101c106 100644 --- 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 #?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 78bb5b55..0fb24cd2 100644 --- 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 #?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 b1084439..03b2456d 100644 --- 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 #?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 8333644b..2ef89aa3 100644 --- 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 #?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 #?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 f2c3d9d1..d5ee4117 100644 --- 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 #?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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index ed85490b..31e264ae 100644 --- 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 #?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 8dd72064..284d1736 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff --git a/tests/scripts/xdg-seat.conf b/tests/scripts/xdg-seat.conf index d738cb57..6ba89780 100644 --- 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 #?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 86b4344b..165179ca 100644 --- 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 #?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 #?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 64141b56..7139ec03 100644 --- 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 #?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 #?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 0ab48b9d..b4e80718 100644 --- 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 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -41,6 +42,7 @@ xserver-share=false # Session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index 3480414d..1e2d5591 100644 --- 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,11 @@ 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) + { + check_status ("CONSOLE-KIT ACTIVATE-SESSION"); + 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 +1215,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 +1291,11 @@ 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) + { + check_status ("LOGIN1 ACTIVATE-SESSION"); + 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 +1313,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 = |