Fix errors in test case and simplify using autologin instead of guest login timeouts to determine which config is applied

1 files changed, 20 insertions, 55 deletions

diff --git a/tests/scripts/multi-seat-with-globbing-config-sections.conf b/tests/scripts/multi-seat-with-globbing-config-sections.conf
index cf4c47a7..3706dfc3 100644
--- a/tests/scripts/multi-seat-with-globbing-config-sections.conf
+++ b/tests/scripts/multi-seat-with-globbing-config-sections.conf
@@ -2,15 +2,18 @@
 # Check can set globbing config sections matching different seats
 #
 
-[Seat:seat*Foo]
-autologin-guest=true
+[Seat:*]
+autologin-user=have-password1
 user-session=default
 
+[Seat:seat*Foo]
+autologin-user=have-password2
+
 [Seat:seat-AAA-Foo]
-autologin-user-timeout=5
+autologin-user=have-password3
 
 [Seat:seat-BBB*]
-autologin-user-timeout=10
+autologin-user=have-password4
 
 #?*START-DAEMON
 #?RUNNER DAEMON-START
@@ -20,12 +23,12 @@ autologin-user-timeout=10
 #?*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
+
+# 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
-#?GREETER-X-0 CONNECT-XSERVER
-#?GREETER-X-0 CONNECT-TO-DAEMON
-#?GREETER-X-0 CONNECTED-TO-DAEMON
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Add seat-AAA-Foo
 #?*ADD-SEAT ID=seat-AAA-Foo
@@ -35,28 +38,10 @@ autologin-user-timeout=10
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
-#?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-GUEST TIMEOUT=5
-
-# Trigger autologin
-#?*GREETER-X-1 AUTHENTICATE-AUTOLOGIN
-#?GREETER-X-1 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-1 START-SESSION
-#?GREETER-X-1 TERMINATE SIGNAL=15
 
-# Guest account created
-#?GUEST-ACCOUNT ADD USERNAME=guest-.*
-
-# Guest session starts
-#?SESSION-X-1 START XDG_SEAT=seat-AAA-Foo XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION SESSION=c2
+# Session starts for configured user
+#?SESSION-X-1 START XDG_SEAT=seat-AAA-Foo XDG_GREETER_DATA_DIR=.*/have-password3 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password3
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -68,39 +53,19 @@ autologin-user-timeout=10
 #?*XSERVER-2 INDICATE-READY
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
-#?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-1 AUTOLOGIN-GUEST TIMEOUT=10
-
-# Trigger autologin
-#?*GREETER-X-2 AUTHENTICATE-AUTOLOGIN
-#?GREETER-X-2 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-2 START-SESSION
-#?GREETER-X-2 TERMINATE SIGNAL=15
-
-# Guest account created
-#?GUEST-ACCOUNT ADD USERNAME=guest-.*
-
-# Guest session starts
-#?SESSION-X-2 START XDG_SEAT=seat-BBB-Foo XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION SESSION=c4
+# Session starts for configured user
+#?SESSION-X-2 START XDG_SEAT=seat-BBB-Foo XDG_GREETER_DATA_DIR=.*/have-password4 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password4
+#?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-2 ACCEPT-CONNECT
 #?SESSION-X-2 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-0 TERMINATE SIGNAL=15
 #?XSERVER-0 TERMINATE SIGNAL=15
-#?XSESSION-X-1 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
 #?XSERVER-1 TERMINATE SIGNAL=15
-#?GUEST-ACCOUNT REMOVE USERNAME=guest.*
-#?XSESSION-X-2 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
 #?XSERVER-2 TERMINATE SIGNAL=15
-#?GUEST-ACCOUNT REMOVE USERNAME=guest.*
+#?SESSION-X-2 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0