Update background tests

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 8b8ad8e916a4158be2af81de8a80f6ebb0c5ee70..2083e1f7b04f97ad8a76c9479b08b8af4c45ad4e 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -1,5 +1,5 @@
 #
-# Check automatically logs in default user while keeping a greeter up
+# Check automatically logs in guest while keeping a greeter up
 #
 
 [LightDM]
@@ -11,54 +11,30 @@ autologin-in-background=true
 
 #?RUNNER DAEMON-START
 
-# The following is a gross expansion of two simultaneous sequences.  One day,
-# when we can specify such things in tests, they should look like the
-# following:
-# 
-# ?XSERVER :50 START
-# ?XSERVER :50 INDICATE-READY
-#
-# Sequence 1:
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 START
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 CONNECT-XSERVER
-# ?GREETER :50 CONNECT-TO-DAEMON
-# ?GREETER :50 CONNECTED-TO-DAEMON
-# GREETER/XSERVER TERMINATE
-# 
-# Sequence 2
-# ?XSERVER :51 START
-# ?XSERVER :51 INDICATE-READY
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?GUEST-ACCOUNT ADD USERNAME=guest-.*
-# ?SESSION :51 START USER=guest-.*
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?SESSION :51 CONNECT-XSERVER
-# SESSION/XSERVER TERMINATE
-
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+# Greeter starts
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
+# Guest session starts
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
+#?XSERVER-51 ACCEPT-CONNECT
+#?GUEST-ACCOUNT ADD USERNAME=guest-.*
+#?SESSION-X-51 START USER=guest-.*
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
+#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index cbee827d6840346a8643c83bf95c809fb4df8aab..a81adb1da3d678a5e3bfdeb4eac8d12871c689be 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -11,51 +11,29 @@ autologin-in-background=true
 
 #?RUNNER DAEMON-START
 
-# The following is a gross expansion of two simultaneous sequences.  One day,
-# when we can specify such things in tests, they should look like the
-# following:
-# 
-# ?XSERVER :50 START
-# ?XSERVER :50 INDICATE-READY
-#
-# Sequence 1:
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 START
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 CONNECT-XSERVER
-# ?GREETER :50 CONNECT-TO-DAEMON
-# ?GREETER :50 CONNECTED-TO-DAEMON
-# GREETER/XSERVER TERMINATE
-# 
-# Sequence 2
-# ?XSERVER :51 START
-# ?XSERVER :51 INDICATE-READY
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?SESSION :51 START USER=have-password1
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?SESSION :51 CONNECT-XSERVER
-# SESSION/XSERVER TERMINATE
-
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+# Greeter starts
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
+# Autologin user starts
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 START USER=have-password1
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 651153eac088463cae2d0a29782dbe98e3bae850..a17f68a0ae174508a0b49ce503f9d83155b5a209 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -12,61 +12,33 @@ autologin-in-background=true
 
 #?RUNNER DAEMON-START
 
-# The following is a gross expansion of two simultaneous sequences.  One day,
-# when we can specify such things in tests, they should look like the
-# following:
-# 
-# ?XSERVER :50 START
-# ?XSERVER :50 INDICATE-READY
-#
-# Sequence 1:
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 START
-# ?XSERVER :50 ACCEPT-CONNECT
-# ?GREETER :50 CONNECT-XSERVER
-# ?GREETER :50 CONNECT-TO-DAEMON
-# ?GREETER :50 CONNECTED-TO-DAEMON
-# ?GREETER :50 AUTOLOGIN-TIMER-EXPIRED
-# ?*GREETER :50 AUTHENTICATE-AUTOLOGIN
-# ?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-# ?*GREETER :50 START-SESSION
-# ?GREETER :50 TERMINATE SIGNAL=15
-#
-# Sequence 2
-# ?XSERVER :51 START
-# ?XSERVER :51 INDICATE-READY
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?SESSION :51 START USER=have-password1
-# ?XSERVER :51 ACCEPT-CONNECT
-# ?SESSION :51 CONNECT-XSERVER
-# SESSION/XSERVER TERMINATE
-
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
-
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER)
-
-# ?GREETER :50 AUTOLOGIN-TIMER-EXPIRED
-# ?*GREETER :50 AUTHENTICATE-AUTOLOGIN
-# ?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-# ?*GREETER :50 START-SESSION
-# ?GREETER :50 TERMINATE SIGNAL=15
+# Greeter starts
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
+
+# Guest session starts
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 START USER=have-password1
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
+
+#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
+#?*GREETER-X-50 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0