Add a test for multi-seat login

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a7f4a77ad5d970e165b0c0c0d91b33aa4c78da7..c64e9a866776794e08643b5cfd195c9709a527cf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -218,6 +218,7 @@ TESTS = \
        test-xdmcp-server-open-file-descriptors \
        test-add-local-x-seat \
        test-multi-seat \
+       test-multi-seat-login \        
        test-multi-seat-seat0-non-graphical \
        test-multi-seat-seat0-non-graphical-disabled \
        test-multi-seat-non-graphical \
@@ -515,6 +516,7 @@ EXTRA_DIST = \
        scripts/multi-seat.conf \
        scripts/multi-seat-change-graphical.conf \
        scripts/multi-seat-change-graphical-disabled.conf \
+       scripts/multi-seat-login.conf \
        scripts/multi-seat-non-graphical.conf \
        scripts/multi-seat-non-graphical-disabled.conf \
        scripts/multi-seat-seat0-non-graphical.conf \

diff --git a/tests/scripts/multi-seat-login.conf b/tests/scripts/multi-seat-login.conf
new file mode 100644 (file)
index 0000000..eb9a4ba
--- /dev/null
+++ b/tests/scripts/multi-seat-login.conf
@@ -0,0 +1,65 @@
+#
+# Check can log in on both seats
+#
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# seat0 starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?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 SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Add seat1
+#?*ADD-SEAT ID=seat1
+
+# seat1 starts
+#?XSERVER-1 START SEAT=seat1
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+
+# Login seat0
+#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Login seat1
+#?*GREETER-X-1 AUTHENTICATE USERNAME=no-password2
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=no-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
+
+# Session starts
+#?SESSION-X-1 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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