Fix in-session greeter not working for greeter logins

4 files changed, 83 insertions, 5 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fd94c9aa..0bf48fcf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -167,7 +167,8 @@ TESTS = \
 	test-switch-to-user-logout-inactive \
 	test-switch-to-user-resettable \
 	test-switch-to-users \
-	test-session-greeter \        
+	test-session-greeter \
+	test-session-greeter-autologin \
 	test-vnc-login \
 	test-vnc-command \
 	test-vnc-dimensions \
@@ -541,6 +542,7 @@ EXTRA_DIST = \
 	scripts/script-hook-session-setup-fail.conf \
 	scripts/script-hook-session-setup-missing.conf \
 	scripts/session-greeter.conf \
+	scripts/session-greeter-autologin.conf \        
 	scripts/session-stdout.conf \
 	scripts/session-stderr.conf \
 	scripts/session-stderr-multi-write.conf \
diff --git a/tests/scripts/session-greeter-autologin.conf b/tests/scripts/session-greeter-autologin.conf
new file mode 100644
index 00000000..f6e7d906
--- /dev/null
+++ b/tests/scripts/session-greeter-autologin.conf
@@ -0,0 +1,59 @@
+#
+# Check can run greeter inside session after autologin
+#
+
+[Seat:*]
+autologin-user=have-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=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=greeter USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Start greeter inside session
+#?*SESSION-X-0 GREETER-START
+#?SESSION-X-0 GREETER-STARTED
+
+# Log into account with a password
+#?*SESSION-X-0 GREETER-AUTHENTICATE USERNAME=have-password2
+#?SESSION-X-0 GREETER-SHOW-PROMPT TEXT="Password:"
+#?*SESSION-X-0 GREETER-RESPOND TEXT="password"
+#?SESSION-X-0 GREETER-AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*SESSION-X-0 GREETER-START-SESSION
+
+# New X server starts
+#?XSERVER-1 START VT=8 SEAT=seat0
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# New session starts
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=greeter USER=have-password2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
+
+# Switch to new session
+#?VT ACTIVATE VT=8
+#?LOGIN1 LOCK-SESSION SESSION=c0
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/session-greeter.conf b/tests/scripts/session-greeter.conf
index b18d4d50..3dde53a5 100644
--- a/tests/scripts/session-greeter.conf
+++ b/tests/scripts/session-greeter.conf
@@ -3,7 +3,6 @@
 #
 
 [Seat:*]
-autologin-user=have-password1
 user-session=greeter
 
 #?*START-DAEMON
@@ -17,9 +16,25 @@ user-session=greeter
 #?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
+
+# Log into account with a password
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?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=greeter USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 
@@ -47,8 +62,8 @@ user-session=greeter
 
 # Switch to new session
 #?VT ACTIVATE VT=8
-#?LOGIN1 LOCK-SESSION SESSION=c0
-#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?LOGIN1 LOCK-SESSION SESSION=c1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 
 # Cleanup
 #?*STOP-DAEMON
diff --git a/tests/test-session-greeter-autologin b/tests/test-session-greeter-autologin
new file mode 100755
index 00000000..91cdc53e
--- /dev/null
+++ b/tests/test-session-greeter-autologin
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner session-greeter-autologin test-gobject-greeter