Add test to confirm in-session greeters can unlock existing sessions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d857007e31a4086e2dd5c2ebbcf46f76748bf643..27a5040854b48835237719844c9a6b2641e9518b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -173,6 +173,7 @@ TESTS = \
        test-session-greeter-reconnect \
        test-session-greeter-unlock \
        test-session-greeter-unlock-twice \
+       test-session-greeter-switch \        
        test-vnc-login \
        test-vnc-command \
        test-vnc-dimensions \
@@ -555,6 +556,7 @@ EXTRA_DIST = \
        scripts/session-greeter.conf \
        scripts/session-greeter-autologin.conf \
        scripts/session-greeter-reconnect.conf \
+       scripts/session-greeter-switch.conf \
        scripts/session-greeter-unlock.conf \
        scripts/session-greeter-unlock-twice.conf \        
        scripts/session-stdout.conf \

diff --git a/tests/scripts/session-greeter-switch.conf b/tests/scripts/session-greeter-switch.conf
new file mode 100644 (file)
index 0000000..a5d7374
--- /dev/null
+++ b/tests/scripts/session-greeter-switch.conf
@@ -0,0 +1,71 @@
+#
+# Check can unlock existing session with an in-session greeter
+#
+
+[Seat:*]
+autologin-user=no-password1
+user-session=greeter
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# 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 XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=greeter USER=no-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Start a second account
+#?*SWITCH-TO-USER USERNAME=no-password2
+#?RUNNER SWITCH-TO-USER USERNAME=no-password2
+
+# New X server starts
+#?XSERVER-1 START VT=8 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Session is locked
+#?LOGIN1 LOCK-SESSION SESSION=c0
+
+# New session starts
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=greeter USER=no-password2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
+
+# Switch to session
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?VT ACTIVATE VT=8
+
+# Start greeter inside session
+#?*SESSION-X-1 GREETER-START
+#?SESSION-X-1 GREETER-STARTED
+
+# Log into first account
+#?*SESSION-X-1 GREETER-AUTHENTICATE USERNAME=no-password1
+#?SESSION-X-1 GREETER-AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*SESSION-X-1 GREETER-START-SESSION
+
+# Switch back to first session
+#?VT ACTIVATE VT=7
+#?LOGIN1 UNLOCK-SESSION SESSION=c0
+#?LOGIN1 LOCK-SESSION SESSION=c1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+
+# 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
+#?RUNNER DAEMON-EXIT STATUS=0

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