Merge from trunk

diff --git a/src/mir-server.c b/src/mir-server.c
index 9414e22fd60a2117c8fbea67e4e857847d2ab029..7b8d4b41afde5dfd009b36a291b6f75260bc1989 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -22,9 +22,6 @@ struct MirServerPrivate
 
     /* Mir socket for this server to talk to parent */
     gchar *parent_socket;
-
-    /* ID to use for Mir connection */
-    gchar *id;
 };
 
 G_DEFINE_TYPE (MirServer, mir_server, DISPLAY_SERVER_TYPE);
@@ -53,35 +50,6 @@ mir_server_set_parent_socket (MirServer *server, const gchar *parent_socket)
     server->priv->parent_socket = g_strdup (parent_socket);
 }
 
-static void
-update_name (MirServer *server)
-{
-    gchar *name;
-
-    if (server->priv->id)
-        name = g_strdup_printf ("mir-%s", server->priv->id);
-    else
-        name = g_strdup ("mir");
-    display_server_set_name (DISPLAY_SERVER (server), name);
-    g_free (name);
-}
-
-void
-mir_server_set_id (MirServer *server, const gchar *id)
-{
-    g_return_if_fail (server != NULL);
-    g_free (server->priv->id);
-    server->priv->id = g_strdup (id);
-    update_name (server);
-}
-
-const gchar *
-mir_server_get_id (MirServer *server)
-{
-    g_return_val_if_fail (server != NULL, NULL);
-    return server->priv->id;
-}
-
 static const gchar *
 mir_server_get_session_type (DisplayServer *server)
 {
@@ -100,8 +68,6 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
     MirServer *server;
 
     server = MIR_SERVER (display_server);
-    if (server->priv->id)
-        session_set_env (session, "MIR_ID", server->priv->id);
     if (server->priv->parent_socket)
         session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
     if (server->priv->vt > 0)
@@ -115,7 +81,6 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
 static void
 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
 {
-    session_unset_env (session, "MIR_ID");
     session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_VT");
 }
@@ -125,7 +90,6 @@ mir_server_init (MirServer *server)
 {
     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, MIR_SERVER_TYPE, MirServerPrivate);
     server->priv->vt = -1;
-    update_name (server);
 }
 
 static void
@@ -137,7 +101,6 @@ mir_server_finalize (GObject *object)
 
     if (server->priv->vt > 0)
         vt_unref (server->priv->vt);
-    g_free (server->priv->id);
     g_free (server->priv->parent_socket);
 
     G_OBJECT_CLASS (mir_server_parent_class)->finalize (object);

diff --git a/src/mir-server.h b/src/mir-server.h
index d91ec560f01761ff643e81611896dac478ebdca4..3e7bc0bba935d7950a5e8710ecde6abbd5494fbc 100644 (file)
--- a/src/mir-server.h
+++ b/src/mir-server.h
@@ -44,10 +44,6 @@ void mir_server_set_vt (MirServer *server, gint vt);
 
 void mir_server_set_parent_socket (MirServer *server, const gchar *parent_socket);
 
-void mir_server_set_id (MirServer *server, const gchar *id);
-
-const gchar *mir_server_get_id (MirServer *server);
-
 G_END_DECLS
 
 #endif /* MIR_SERVER_H_ */

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 7190279f2f5c9d483386a1b78228ed41e1511028..2d2373b0f763b2bb4b3e2d12ca5afa7a94527981 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -64,8 +64,10 @@ struct SeatUnityPrivate
     /* Timeout when waiting for compositor to start */
     guint compositor_timeout;
 
-    /* Next Mir ID to use for a compositor client */
-    gint next_id;
+    /* Next Mir ID to use for a Mir sessions, X server and greeters */
+    gint next_session_id;
+    gint next_x_server_id;
+    gint next_greeter_id;
 
     /* TRUE if using VT switching fallback */
     gboolean use_vt_switching;
@@ -423,8 +425,8 @@ create_x_server (Seat *seat)
     {
         gchar *id;
 
-        id = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->next_id);
-        SEAT_UNITY (seat)->priv->next_id++;
+        id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id);
+        SEAT_UNITY (seat)->priv->next_x_server_id++;
         x_server_local_set_mir_id (x_server, id);
         x_server_local_set_mir_socket (x_server, SEAT_UNITY (seat)->priv->mir_socket_filename);
         g_free (id);
@@ -502,15 +504,6 @@ create_mir_server (Seat *seat)
 
     if (SEAT_UNITY (seat)->priv->use_vt_switching)
         mir_server_set_vt (mir_server, vt_get_unused ());
-    else
-    {
-        gchar *id;
-
-        id = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->next_id);
-        SEAT_UNITY (seat)->priv->next_id++;
-        mir_server_set_id (mir_server, id);
-        g_free (id);
-    }   
 
     return DISPLAY_SERVER (mir_server);
 }
@@ -534,6 +527,7 @@ seat_unity_create_greeter_session (Seat *seat)
 {
     Greeter *greeter_session;
     const gchar *xdg_seat;
+    gchar *id;
     gint vt = -1;
 
     greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
@@ -543,6 +537,11 @@ seat_unity_create_greeter_session (Seat *seat)
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat);
 
+    id = g_strdup_printf ("greeter-%d", SEAT_UNITY (seat)->priv->next_greeter_id);
+    SEAT_UNITY (seat)->priv->next_greeter_id++;
+    session_set_env (SESSION (greeter_session), "MIR_SERVER_NAME", id);
+    g_free (id);
+
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
         vt = SEAT_UNITY (seat)->priv->vt;
 
@@ -564,6 +563,7 @@ seat_unity_create_session (Seat *seat)
 {
     Session *session;
     const gchar *xdg_seat;
+    gchar *id;
     gint vt = -1;
 
     session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
@@ -573,6 +573,11 @@ seat_unity_create_session (Seat *seat)
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (session, "XDG_SEAT", xdg_seat);
 
+    id = g_strdup_printf ("session-%d", SEAT_UNITY (seat)->priv->next_session_id);
+    SEAT_UNITY (seat)->priv->next_session_id++;
+    session_set_env (session, "MIR_SERVER_NAME", id);
+    g_free (id);
+
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
         vt = SEAT_UNITY (seat)->priv->vt;
 
@@ -618,8 +623,8 @@ seat_unity_set_active_session (Seat *seat, Session *session)
 
         if (IS_X_SERVER_LOCAL (display_server))
             id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
-        else if (IS_MIR_SERVER (display_server))
-            id = mir_server_get_id (MIR_SERVER (display_server));
+        else
+            id = session_get_env (session, "MIR_SERVER_NAME");
 
         if (id)
         {
@@ -674,8 +679,8 @@ seat_unity_set_next_session (Seat *seat, Session *session)
 
     if (IS_X_SERVER_LOCAL (display_server))
         id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
-    else if (IS_MIR_SERVER (display_server))
-        id = mir_server_get_id (MIR_SERVER (display_server));
+    else
+        id = session_get_env (session, "MIR_SERVER_NAME");
 
     if (id)
     {

diff --git a/src/session.c b/src/session.c
index 9b985b72d5296a9fda646e68c86f2cc89e75c48f..9e8db51a38b7ef0044ea56c11144f54d3432c98a 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -291,6 +291,21 @@ session_set_env (Session *session, const gchar *name, const gchar *value)
         session->priv->env = g_list_append (session->priv->env, entry);
 }
 
+const gchar *
+session_get_env (Session *session, const gchar *name)
+{
+    GList *link;
+    gchar *entry;
+
+    link = find_env_entry (session, name);
+    if (!link)
+        return NULL;
+  
+    entry = link->data;
+
+    return entry + strlen (name) + 1;
+}
+
 void
 session_unset_env (Session *session, const gchar *name)
 {

diff --git a/src/session.h b/src/session.h
index 53294adec0a8218e43bb0ff56002733c1d04c426..9be15381cd9a999e94e53f0fe7a691c63e8da411 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -93,6 +93,8 @@ void session_set_remote_host_name (Session *session, const gchar *remote_host_na
 
 void session_set_env (Session *session, const gchar *name, const gchar *value);
 
+const gchar *session_get_env (Session *session, const gchar *name);
+
 void session_unset_env (Session *session, const gchar *name);
 
 void session_set_argv (Session *session, gchar **argv);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c5cbe85a2975896d3ac7234b1220c00b41fee990..996ef8acac7e1004fcc0ffa23cf2f8c786a4e706 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -151,6 +151,7 @@ TESTS = \
        test-unity-compositor-fail-start \
        test-unity-compositor-fail-ready \
        test-unity-compositor-next-session \
+       test-unity-compositor-mir-next-session \
        test-unity-autologin \
        test-unity-login \
        test-unity-switch \

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 421d9e58bb8d6e2b0f4f10255b4a2fad9fe3ff52..59a339bd8a551318c98e449c898afb5e15d17c24 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -14,7 +14,7 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -27,7 +27,7 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index f831cde978864fbba99187bfa564eed60c5b0f9e..7edc35e021201a855b413a3f464cff672ab060d4 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -14,7 +14,7 @@ unity-compositor-command=unity-system-compositor --test
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -29,7 +29,7 @@ unity-compositor-command=unity-system-compositor --test
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf
new file mode 100644 (file)
index 0000000..9b273ba
--- /dev/null
+++ b/tests/scripts/unity-compositor-mir-next-session.conf
@@ -0,0 +1,42 @@
+#
+# Check that we correctly set next session when switching selected greeter user in Mir
+#
+
+[SeatDefaults]
+type=unity
+user-session=mir
+autologin-user=have-password2
+autologin-in-background=true
+
+#?RUNNER DAEMON-START
+
+# System compositor
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# Greeter session
+#?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
+#?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
+
+# Background session
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password2
+
+# System compositor switches to greeter
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0
+
+# Switch to user without a session
+#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-MIR-greeter-0 SHOW-PROMPT TEXT="Password:"
+
+# Switch to user with a session
+#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=have-password2
+#?GREETER-MIR-greeter-0 SHOW-PROMPT TEXT="Password:"
+#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=session-0
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index bf22505e4a3eca1588ae5948de0a77f773ac0fdf..5fcf9fbf384bc77f55a07a3fd00b75523f89e655 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -15,7 +15,7 @@ autologin-in-background=true
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter session
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
@@ -26,7 +26,7 @@ autologin-in-background=true
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Background session
-#?XSERVER-1 START MIR-ID=1
+#?XSERVER-1 START MIR-ID=x-1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
@@ -35,7 +35,7 @@ autologin-in-background=true
 #?SESSION-X-1 CONNECT-XSERVER
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Switch to user without a session
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
@@ -44,7 +44,7 @@ autologin-in-background=true
 # Switch to user with a session
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2
 #?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
-#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=x-1
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index 7c1a28c62162172c80828d87ee8344e606288a2b..329b6076d3a6d08e98873e365d58910ebd44ba35 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -13,7 +13,7 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -28,7 +28,7 @@ user-session=default
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Log into account with a password
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1

diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf
index 0d59bda5c7ef1e18529ecf986b793b6e91bfdd34..8dcacf458714a00a814d4864523cc83acc6808c0 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -14,13 +14,13 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-0 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index d3d462ba8826629b78500c5042c0ae2a264b6de5..75507e226792ddb0a9f70ad67e2a12a777fc5310 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -13,29 +13,29 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?GREETER-MIR-0 CONNECT-TO-DAEMON
-#?GREETER-MIR-0 CONNECTED-TO-DAEMON
+#?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
+#?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0
 
 # Log into account with a password
-#?*GREETER-MIR-0 AUTHENTICATE USERNAME=no-password1
-#?GREETER-MIR-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-MIR-0 START-SESSION
+#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-MIR-greeter-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-MIR-greeter-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Greeter stops
-#?GREETER-MIR-0 TERMINATE SIGNAL=15
+#?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-1 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index a577faf01f0b65c73cca9462d30610772fc56533..d4b2f37a77fcab64865cd57f88ab2a8325c0279e 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -13,20 +13,20 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?GREETER-MIR-0 CONNECT-TO-DAEMON
-#?GREETER-MIR-0 CONNECTED-TO-DAEMON
+#?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
+#?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0
 
 # Log into account with a password
-#?*GREETER-MIR-0 AUTHENTICATE USERNAME=no-password1
-#?GREETER-MIR-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-MIR-0 START-SESSION
+#?*GREETER-MIR-greeter-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-MIR-greeter-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-MIR-greeter-0 START-SESSION
 
 # X server starts
-#?XSERVER-0 START MIR-ID=1
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -39,10 +39,10 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Greeter stops
-#?GREETER-MIR-0 TERMINATE SIGNAL=15
+#?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index 335214bff9112b7a50761412f9bb093c938e2a4d..02e4026948a86dff60e3c693a3e2139960e3bf38 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -13,7 +13,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -28,7 +28,7 @@ user-session=mir
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Log into account
 #?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
@@ -36,10 +36,10 @@ user-session=mir
 #?*GREETER-X-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Greeter quits once session ready
 #?GREETER-X-0 TERMINATE SIGNAL=15
@@ -47,6 +47,6 @@ user-session=mir
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-1 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index 6ceeefa11f051182014027f67316b06aaac60d54..4c27c3c8bad1f312678723afec0697aee08eed66 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -24,7 +24,7 @@ active=true
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -37,7 +37,7 @@ active=true
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index e78994d974eb75dfed0919491c8dc649f46f29ef..170404e02a2091daba1064dbf3b18e3429bf49c8 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -14,7 +14,7 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -27,14 +27,14 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-1 START MIR-ID=1
+#?XSERVER-1 START MIR-ID=x-1
 
 # Daemon connects when X server is ready
 #?*XSERVER-1 INDICATE-READY
@@ -52,7 +52,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-1
 
 # Login
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
@@ -72,7 +72,7 @@ user-session=default
 #?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-2 START MIR-ID=2
+#?XSERVER-2 START MIR-ID=x-2
 #?*XSERVER-2 INDICATE-READY
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
@@ -85,7 +85,7 @@ user-session=default
 #?GREETER-X-2 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=2
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-2
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf
index c76923dedf1040bb9ab5068bb56a178d83323060..85ee61cb6ea63cd65ba9c3c7528ce3452244a1df 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -15,7 +15,7 @@ xdg-seat=seat1
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START SEAT=seat1 MIR-ID=0
+#?XSERVER-0 START SEAT=seat1 MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -28,7 +28,7 @@ xdg-seat=seat1
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 332ded960de63ba6d85ed5239df807ef05e4730d..f29159f0ca6ac3de05359e7a2a94cb2100d91b00 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -313,7 +313,7 @@ main (int argc, char **argv)
     xdg_session_class = getenv ("XDG_SESSION_CLASS");
     mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
-    mir_id = getenv ("MIR_ID");
+    mir_id = getenv ("MIR_SERVER_NAME");
     if (display)
     {
         if (display[0] == ':')

diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index fd0741dc9b3a969155343b27d9be6bb52ed04f46..5f2a04d444ac5c35571fdd8e141332e835012ce7 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -215,7 +215,7 @@ main (int argc, char **argv)
     desktop_session = getenv ("DESKTOP_SESSION");
     mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
-    mir_id = getenv ("MIR_ID");
+    mir_id = getenv ("MIR_SERVER_NAME");
     if (display)
     {
         if (display[0] == ':')

diff --git a/tests/test-unity-compositor-mir-next-session b/tests/test-unity-compositor-mir-next-session
new file mode 100755 (executable)
index 0000000..cda2ca5
--- /dev/null
+++ b/tests/test-unity-compositor-mir-next-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-compositor-mir-next-session test-mir-greeter