Add tests for VT switched Mir sessions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a53d61f2e7d142ce3127a9e266e32fa26d0e4087..86646bdf385af426cc7a9a2f0ca969dcc00ad615 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,12 +27,9 @@ TESTS = \
        test-autologin-new-authtok \
        test-autologin-gobject-timeout \
        test-autologin-gobject-guest-timeout \
-       test-autologin-python-timeout \
-       test-autologin-python-guest-timeout \
        test-change-authentication \
        test-restart-authentication \
        test-gobject-cancel-authentication \
-       test-python-cancel-authentication \
        test-pam \
        test-login-pam \
        test-denied \
@@ -59,7 +56,6 @@ TESTS = \
        test-user-renamed \
        test-user-renamed-invalid \
        test-users-gobject \
-       test-users-python \
        test-keyboard-layout \
        test-no-keyboard-layout \
        test-language \
@@ -90,29 +86,6 @@ TESTS = \
        test-login-gobject-guest-fail-setup-script \
        test-login-gobject-guest-logout \
        test-login-gobject-remote-session \
-       test-login-python \
-       test-login-python-manual \
-       test-login-python-manual-previous-session \
-       test-login-python-no-password \
-       test-login-python-long-username \
-       test-login-python-long-password \
-       test-login-python-two-factor \
-       test-login-python-new-authtok \
-       test-login-python-info-prompt \
-       test-login-python-multi-info-prompt \
-       test-login-python-previous-session \
-       test-login-python-wrong-password \
-       test-login-python-invalid-user \
-       test-login-python-invalid-session \
-       test-login-python-logout \
-       test-login-python-pick-session \
-       test-login-python-remember-session \
-       test-login-python-guest \
-       test-login-python-guest-disabled \
-       test-login-python-guest-no-setup-script \
-       test-login-python-guest-fail-setup-script \
-       test-login-python-guest-logout \
-       test-login-python-remote-session \
        test-login-session-crash \
        test-login-xserver-crash \
        test-xserver-no-share \
@@ -159,12 +132,11 @@ TESTS = \
        test-gobject-power-no-console-kit \
        test-gobject-power-no-login1 \
        test-gobject-power-no-services \
-       test-python-power \
-       test-python-power-no-console-kit \
-       test-python-power-no-login1 \
-       test-python-power-no-services \
        test-open-file-descriptors \
        test-xdmcp-server-open-file-descriptors \
+       test-mir-greeter-x-session \
+       test-mir-greeter-mir-session \
+       test-mir-session-x-greeter \
        test-unity-compositor-command \
        test-unity-compositor-fail-start \
        test-unity-compositor-fail-ready \
@@ -180,6 +152,39 @@ TESTS = \
 #   test-qt-change-password
 #   test-autologin-create-directory
 
+TESTS += \
+       test-python-cancel-authentication \
+       test-users-python \
+       test-login-python \
+       test-login-python-manual \
+       test-login-python-manual-previous-session \
+       test-login-python-no-password \
+       test-login-python-long-username \
+       test-login-python-long-password \
+       test-login-python-two-factor \
+       test-login-python-new-authtok \
+       test-login-python-info-prompt \
+       test-login-python-multi-info-prompt \
+       test-login-python-previous-session \
+       test-login-python-wrong-password \
+       test-login-python-invalid-user \
+       test-login-python-invalid-session \
+       test-login-python-logout \
+       test-login-python-pick-session \
+       test-login-python-remember-session \
+       test-login-python-guest \
+       test-login-python-guest-disabled \
+       test-login-python-guest-no-setup-script \
+       test-login-python-guest-fail-setup-script \
+       test-login-python-guest-logout \
+       test-login-python-remote-session \
+       test-autologin-python-timeout \
+       test-autologin-python-guest-timeout \
+       test-python-power \
+       test-python-power-no-console-kit \
+       test-python-power-no-login1 \
+       test-python-power-no-services
+
 if COMPILE_LIBLIGHTDM_QT4
 TESTS += \
        test-autologin-qt4-timeout \
@@ -261,6 +266,7 @@ EXTRA_DIST = \
        data/greeters/test-qt5-greeter.desktop \
        data/sessions/alternative.desktop \
        data/sessions/default.desktop \
+       data/sessions/mir.desktop \
        scripts/0-additional.conf \
        scripts/1-additional.conf \
        scripts/additional-config.conf \
@@ -343,6 +349,9 @@ EXTRA_DIST = \
        scripts/login-two-factor.conf \
        scripts/login-wrong-password.conf \
        scripts/login-xserver-crash.conf \
+       scripts/mir-greeter-x-session.conf \
+       scripts/mir-greeter-mir-session.conf \
+       scripts/mir-session-x-greeter.conf \
        scripts/no-accounts-service.conf \
        scripts/no-config.conf \
        scripts/no-console-kit.conf \

diff --git a/tests/data/sessions/mir.desktop b/tests/data/sessions/mir.desktop
new file mode 100644 (file)
index 0000000..afa9d59
--- /dev/null
+++ b/tests/data/sessions/mir.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Test Session
+Comment=LightDM test Mir session
+Exec=test-session
+X-LightDM-Session-Type=mir

diff --git a/tests/scripts/mir-greeter-x-session.conf b/tests/scripts/mir-greeter-x-session.conf
new file mode 100644 (file)
index 0000000..f7de061
--- /dev/null
+++ b/tests/scripts/mir-greeter-x-session.conf
@@ -0,0 +1,39 @@
+#
+# Check can run a Mir greeter and log into an X session
+#
+
+[SeatDefaults]
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# Greeter starts
+#?GREETER-MIR START VT=7
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-MIR CONNECT-TO-DAEMON
+#?GREETER-MIR CONNECTED-TO-DAEMON
+
+# Log into account
+#?*GREETER-MIR AUTHENTICATE USERNAME=no-password1
+#?GREETER-MIR AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-MIR START-SESSION SESSION=mir
+#?GREETER-MIR TERMINATE SIGNAL=15
+
+# X server starts for session
+#?XSERVER-0 START VT=8
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/mir-session-x-greeter.conf b/tests/scripts/mir-session-x-greeter.conf
new file mode 100644 (file)
index 0000000..ccda9b4
--- /dev/null
+++ b/tests/scripts/mir-session-x-greeter.conf
@@ -0,0 +1,40 @@
+#
+# Check can login to a Mir session from an X greeter
+#
+
+[SeatDefaults]
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?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
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Log into account
+#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION SESSION=mir
+
+# Session starts
+#?SESSION-MIR START VT=8 USER=have-password1
+
+# Greeter quits once session ready
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-MIR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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

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

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