Fix typo and add test that would have caught it

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 33d5ffda802a41f41b961017ee61da0af6d75b24..2d2373b0f763b2bb4b3e2d12ca5afa7a94527981 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -680,7 +680,7 @@ 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
-        id = session_get_env (session, "MIR_SESSION_NAME");
+        id = session_get_env (session, "MIR_SERVER_NAME");
 
     if (id)
     {

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-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf
new file mode 100644 (file)
index 0000000..cfb95e8
--- /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
+#?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/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