Remove built-in xlocal fallback from unity seat; adjust tests; add test for new type...

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 2d2373b0f763b2bb4b3e2d12ca5afa7a94527981..e9a89e02f7bb4d081a8cc9430deb66755fdf0ea4 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -69,9 +69,6 @@ struct SeatUnityPrivate
     gint next_x_server_id;
     gint next_greeter_id;
 
-    /* TRUE if using VT switching fallback */
-    gboolean use_vt_switching;
-
     /* The currently visible session */
     Session *active_session;
     DisplayServer *active_display_server;
@@ -109,15 +106,6 @@ compositor_stopped_cb (Process *process, SeatUnity *seat)
         return;
     }
 
-    /* If stopped before it was ready, then revert to VT mode */
-    if (!seat->priv->compositor_ready)
-    {
-        l_debug (seat, "Compositor failed to start, switching to VT mode");
-        seat->priv->use_vt_switching = TRUE;
-        SEAT_CLASS (seat_unity_parent_class)->start (SEAT (seat));
-        return;
-    }
-
     l_debug (seat, "Stopping Unity seat, compositor terminated");
 
     seat_stop (SEAT (seat));
@@ -410,6 +398,7 @@ create_x_server (Seat *seat)
     const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL, *xdg_seat = NULL;
     gboolean allow_tcp;
     gint port = 0;
+    gchar *id;
 
     l_debug (seat, "Starting X server on Unity compositor");
 
@@ -419,18 +408,11 @@ create_x_server (Seat *seat)
     if (command)
         x_server_local_set_command (x_server, command);
 
-    if (SEAT_UNITY (seat)->priv->use_vt_switching)
-        x_server_local_set_vt (x_server, vt_get_unused ());
-    else
-    {
-        gchar *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);
-    }
+    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);
 
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
@@ -502,9 +484,6 @@ create_mir_server (Seat *seat)
     mir_server = mir_server_new ();
     mir_server_set_parent_socket (mir_server, SEAT_UNITY (seat)->priv->mir_socket_filename);
 
-    if (SEAT_UNITY (seat)->priv->use_vt_switching)
-        mir_server_set_vt (mir_server, vt_get_unused ());
-
     return DISPLAY_SERVER (mir_server);
 }
 
@@ -528,7 +507,7 @@ seat_unity_create_greeter_session (Seat *seat)
     Greeter *greeter_session;
     const gchar *xdg_seat;
     gchar *id;
-    gint vt = -1;
+    gint vt;
 
     greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
     xdg_seat = seat_get_string_property (seat, "xdg-seat");
@@ -542,9 +521,7 @@ seat_unity_create_greeter_session (Seat *seat)
     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;
-
+    vt = SEAT_UNITY (seat)->priv->vt;
     if (vt >= 0)
     {
         gchar *value = g_strdup_printf ("%d", vt);
@@ -564,7 +541,7 @@ seat_unity_create_session (Seat *seat)
     Session *session;
     const gchar *xdg_seat;
     gchar *id;
-    gint vt = -1;
+    gint vt;
 
     session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
     xdg_seat = seat_get_string_property (seat, "xdg-seat");
@@ -578,9 +555,7 @@ seat_unity_create_session (Seat *seat)
     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;
-
+    vt = SEAT_UNITY (seat)->priv->vt;
     if (vt >= 0)
     {
         gchar *value = g_strdup_printf ("%d", vt);
@@ -599,17 +574,6 @@ seat_unity_set_active_session (Seat *seat, Session *session)
 {
     DisplayServer *display_server;
 
-    /* If no compositor, have to use VT switching */
-    if (SEAT_UNITY (seat)->priv->use_vt_switching)
-    {
-        gint vt = display_server_get_vt (session_get_display_server (session));
-        if (vt >= 0)
-            vt_set_active (vt);
-
-        SEAT_CLASS (seat_unity_parent_class)->set_active_session (seat, session);
-        return;
-    }
-
     if (session == SEAT_UNITY (seat)->priv->active_session)
         return;
     SEAT_UNITY (seat)->priv->active_session = g_object_ref (session);
@@ -641,24 +605,6 @@ seat_unity_set_active_session (Seat *seat, Session *session)
 static Session *
 seat_unity_get_active_session (Seat *seat)
 {
-    if (SEAT_UNITY (seat)->priv->use_vt_switching)
-    {
-        gint vt;
-        GList *link;
-        vt = vt_get_active ();
-        if (vt < 0)
-            return NULL;
-
-        for (link = seat_get_sessions (seat); link; link = link->next)
-        {
-            Session *session = link->data;
-            if (display_server_get_vt (session_get_display_server (session)) == vt)
-                return session;
-        }
-
-        return NULL;
-    }
-
     return SEAT_UNITY (seat)->priv->active_session;
 }
 
@@ -671,10 +617,6 @@ seat_unity_set_next_session (Seat *seat, Session *session)
     if (!session)
         return;
 
-    /* If no compositor, don't worry about it */
-    if (SEAT_UNITY (seat)->priv->use_vt_switching)
-        return;
-
     display_server = session_get_display_server (session);
 
     if (IS_X_SERVER_LOCAL (display_server))

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6bc5167aa4d8d8c452afa853d9f74b62ed49910d..7347a419bf353ab09b4a4960833974dbd418ca64 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,6 +156,7 @@ TESTS = \
        test-unity-compositor-command \
        test-unity-compositor-fail-start \
        test-unity-compositor-fail-ready \
+       test-unity-compositor-fallback \
        test-unity-compositor-next-session \
        test-unity-compositor-mir-next-session \
        test-unity-autologin \
@@ -431,6 +432,7 @@ EXTRA_DIST = \
        scripts/unity-compositor-command.conf \
        scripts/unity-compositor-fail-ready.conf \
        scripts/unity-compositor-fail-start.conf \
+       scripts/unity-compositor-fallback.conf \
        scripts/unity-compositor-mir-next-session.conf \
        scripts/unity-compositor-next-session.conf \
        scripts/unity-login.conf \

diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf
index d197d9fc11c7a1b49b67c02ff6ed56111f1fd93f..6b6c454b53801fe4e33c6a35695362c487690420 100644 (file)
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -1,5 +1,5 @@
 #
-# Check falls back to VT switching when the compositor fails to indicate it is ready
+# Check clean stop when the compositor fails to indicate it is ready
 #
 
 [SeatDefaults]
@@ -14,23 +14,5 @@ unity-compositor-timeout=1
 # Timeout and compositor is stopped
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 
-# X server starts in VT mode
-#?XSERVER-0 START VT=7
-
-# Daemon connects when X server is ready
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 CONNECT-XSERVER
-#?GREETER-X-0 CONNECT-TO-DAEMON
-#?GREETER-X-0 CONNECTED-TO-DAEMON
-
 # Cleanup
-#?*STOP-DAEMON
-#?GREETER-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
+#?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf
index 25e6e45a6acc8b983cf43dba5587d6d619035370..206e9f86d1d904742dbcfb84180c790bfe9cb56d 100644 (file)
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -1,5 +1,5 @@
 #
-# Check falls back to VT switching when the compositor fails to start
+# Check clean stop when the compositor fails to start
 #
 
 [unity-system-compositor-config]
@@ -14,23 +14,5 @@ type=unity
 #?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
 
-# X server starts in VT mode
-#?XSERVER-0 START VT=7
-
-# Daemon connects when X server is ready
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 CONNECT-XSERVER
-#?GREETER-X-0 CONNECT-TO-DAEMON
-#?GREETER-X-0 CONNECTED-TO-DAEMON
-
 # Cleanup
-#?*STOP-DAEMON
-#?GREETER-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
+#?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf
new file mode 100644 (file)
index 0000000..ba4261d
--- /dev/null
+++ b/tests/scripts/unity-compositor-fallback.conf
@@ -0,0 +1,36 @@
+#
+# Check seat type falls back when the compositor fails to start
+#
+
+[unity-system-compositor-config]
+return-value=1
+
+[SeatDefaults]
+type=unity;xlocal;
+
+#?RUNNER DAEMON-START
+
+# System compositor fails to start
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
+
+# X server starts in VT mode
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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