Reintroduce test after merge with trunk.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1685d28365ce75bcfeac8297daa14ef2b0dce6ae..ae1a7a420bdf729cd8de7fa3b2cfb63580fdc061 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -183,6 +183,7 @@ TESTS = \
        test-multi-seat \
        test-multi-seat-non-graphical \
        test-multi-seat-change-graphical \
+       test-multi-seat-globbing-config-sections \
        test-mir-autologin \
        test-mir-greeter \
        test-mir-session \
@@ -448,6 +449,7 @@ EXTRA_DIST = \
        scripts/multi-seat.conf \
        scripts/multi-seat-non-graphical.conf \
        scripts/multi-seat-change-graphical.conf \
+       scripts/multi-seat-globbing-config-sections.conf \
        scripts/no-accounts-service.conf \
        scripts/no-config.conf \
        scripts/no-console-kit.conf \

diff --git a/tests/scripts/multi-seat-globbing-config-sections.conf b/tests/scripts/multi-seat-globbing-config-sections.conf
new file mode 100644 (file)
index 0000000..e31d9ac
--- /dev/null
+++ b/tests/scripts/multi-seat-globbing-config-sections.conf
@@ -0,0 +1,105 @@
+#
+# Check can set globbing config sections matching different seats
+#
+
+[Seat:*]
+autologin-user=have-password1
+user-session=default
+
+[Seat:seat*Foo]
+autologin-user-timeout=99
+
+[Seat:seat-AAA-Foo]
+autologin-user=have-password2
+
+[Seat:seat-BBB*]
+autologin-user=have-password3
+
+#?*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
+
+# Session starts for configured user
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Add seat-AAA-Foo
+#?*ADD-SEAT ID=seat-AAA-Foo
+
+# seat-AAA-Foo starts
+#?XSERVER-1 START SEAT=seat-AAA-Foo SHAREVTS=TRUE
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat-AAA-Foo 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
+
+# Greeter is requested to timeout
+#?GREETER-X-1 AUTOLOGIN-USER USERNAME=have-password2 TIMEOUT=99
+
+# Trigger autologin
+#?*GREETER-X-1 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
+
+# Session starts for configured user
+#?SESSION-X-1 START XDG_SEAT=seat-AAA-Foo XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
+
+# Add seat-BBB-Foo
+#?*ADD-SEAT ID=seat-BBB-Foo
+
+# seat-BBB-Foo starts
+#?XSERVER-2 START SEAT=seat-BBB-Foo SHAREVTS=TRUE
+#?*XSERVER-2 INDICATE-READY
+#?XSERVER-2 INDICATE-READY
+#?XSERVER-2 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-2 START XDG_SEAT=seat-BBB-Foo XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c3
+#?XSERVER-2 ACCEPT-CONNECT
+#?GREETER-X-2 CONNECT-XSERVER
+#?GREETER-X-2 CONNECT-TO-DAEMON
+#?GREETER-X-2 CONNECTED-TO-DAEMON
+
+# Greeter is requested to timeout
+#?GREETER-X-2 AUTOLOGIN-USER USERNAME=have-password3 TIMEOUT=99
+
+# Trigger autologin
+#?*GREETER-X-2 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-2 AUTHENTICATION-COMPLETE USERNAME=have-password3 AUTHENTICATED=TRUE
+#?*GREETER-X-2 START-SESSION
+#?GREETER-X-2 TERMINATE SIGNAL=15
+
+# Session starts for configured user
+#?SESSION-X-2 START XDG_SEAT=seat-BBB-Foo XDG_GREETER_DATA_DIR=.*/have-password3 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password3
+#?LOGIN1 ACTIVATE-SESSION SESSION=c4
+#?XSERVER-2 ACCEPT-CONNECT
+#?SESSION-X-2 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-2 TERMINATE SIGNAL=15
+#?SESSION-X-2 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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