Do timed autologin each time you are returned to the greeter

3 files changed, 78 insertions, 1 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b9613062..183577b1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,6 +44,7 @@ TESTS = \
 	test-cred-unavail \
 	test-autologin-session-error \
 	test-autologin-logout \
+	test-autologin-timeout-logout \
 	test-autologin-previous-session \
 	test-autologin-guest \
 	test-autologin-guest-session-config \
@@ -349,7 +350,6 @@ EXTRA_DIST = \
 	scripts/autologin-in-background.conf \
 	scripts/autologin-invalid-greeter.conf \
 	scripts/autologin-pam.conf \
-	scripts/autologin-timeout-in-background.conf \
 	scripts/autologin-invalid-session.conf \
 	scripts/autologin-invalid-user.conf \
 	scripts/autologin-logout.conf \
@@ -359,6 +359,8 @@ EXTRA_DIST = \
 	scripts/autologin-session-crash.conf \
 	scripts/autologin-session-error.conf \
 	scripts/autologin-timeout.conf \
+	scripts/autologin-timeout-in-background.conf \
+	scripts/autologin-timeout-logout.conf \
 	scripts/autologin-xserver-crash.conf \
 	scripts/change-authentication.conf \
 	scripts/cancel-authentication.conf \
diff --git a/tests/scripts/autologin-timeout-logout.conf b/tests/scripts/autologin-timeout-logout.conf
new file mode 100644
index 00000000..69615431
--- /dev/null
+++ b/tests/scripts/autologin-timeout-logout.conf
@@ -0,0 +1,73 @@
+#
+# Check logging out after autologin returns to greeter and does timed login again
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+autologin-user-timeout=99
+user-session=default
+
+#?*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
+
+# Greeter starts
+#?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
+
+# Greeter is requested to timeout
+#?GREETER-X-0 AUTOLOGIN-USER USERNAME=have-password1 TIMEOUT=99
+
+# Trigger autologin
+#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-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=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Logout session
+#?*SESSION-X-0 LOGOUT
+
+# X server stops
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+# 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
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Greeter is requested to timeout
+#?GREETER-X-0 AUTOLOGIN-USER USERNAME=have-password1 TIMEOUT=99
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/test-autologin-timeout-logout b/tests/test-autologin-timeout-logout
new file mode 100755
index 00000000..e72a4430
--- /dev/null
+++ b/tests/test-autologin-timeout-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-timeout-logout test-gobject-greeter