1 files changed, 18 insertions, 22 deletions
diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 7a1a34ca..984ef3aa 100644
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -2,9 +2,6 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 display-setup-script=test-script-hook DISPLAY-SETUP
 greeter-setup-script=test-script-hook GREETER-SETUP
@@ -15,51 +12,50 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # Script hook runs
 #?SCRIPT-HOOK SESSION-CLEANUP
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK GREETER-SETUP
 
 # 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-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0