1 files changed, 32 insertions, 33 deletions
diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 85376aa9..f78502c9 100644
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -8,56 +8,55 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?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
 
 # Login
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 RESPOND TEXT="password"
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Lock the seat
-#?*SESSION :50 LOCK-SEAT
-#?SESSION :50 LOCK-SEAT
+#?*SESSION-X-50 LOCK-SEAT
+#?SESSION-X-50 LOCK-SEAT
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
-#?GREETER :51 LOCK-HINT
+#?GREETER-X-51 START
+#?XSERVER-51 ACCEPT-CONNECT
+#?GREETER-X-51 CONNECT-XSERVER
+#?GREETER-X-51 CONNECT-TO-DAEMON
+#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-51 LOCK-HINT
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0