Synchronise X server starting.

Approved by PS Jenkins bot, Robert Ancell.

diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf
index 204ab8900ba45cfddac7424d3cc1705e1bab2e99..252906e1d31fb45f95325c14cc0aea1d6f32fb03 100644 (file)
--- a/tests/scripts/additional-config.conf
+++ b/tests/scripts/additional-config.conf
@@ -12,9 +12,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index c9573c9bc28f65601a9869749c59b952470d592d..37b3ba1d29c395535a8c426abc7262009fe2d58d 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -12,9 +12,10 @@ autologin-guest=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (guest account attempts to start and fails)

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 7dcea539264baa9e475ca1a3f8d7e6e1de219db1..a6d36b94a68660ee13485959d5001751b1f56113 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -14,6 +14,7 @@ user-session=default
 
 # Greeter starts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START
@@ -24,6 +25,7 @@ user-session=default
 
 # Guest session starts
 #?XSERVER-1 START VT=8
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index aefb7fd49eb011d2fe2638110fcf8531c83fd6f8..f4beb5587152dab7dcdd85b8cddc5dbd72434b44 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Guest account created
@@ -37,9 +38,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
index 7342c5a230c39e56f546307e89f441da4d128d6b..1b813cf751ee43d6977e5e0e8e2ce1cae0cfea17 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -14,9 +14,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index e7a1723b3d67ee8a74405e18d09949150574c7c6..7d28833468046f100963ac020003ef7ebc577b67 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Guest account created

diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index 74f8b994f455da89c0555ae2cbae781c002655f4..08511771e09621fd6c86fa011ff246370354eccf 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -11,6 +11,7 @@ user-session=default
 
 # Greeter starts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START
@@ -21,6 +22,7 @@ user-session=default
 
 # Autologin session starts
 #?XSERVER-1 START VT=8
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 START USER=have-password1

diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index 8e881a8b0fe21d96c96f67d2a271e17942af4f95..ce05b417263a7d2b98940c33eafccb40e7bc9894 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -10,9 +10,10 @@ user-session=invalid
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (session fails to start)

diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index 7ce9cc20138d4ecebb4cb5dfcd5426d8f07d7c2e..c781ca4007c13b1d05bfab415155eb0f9015e125 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -9,9 +9,10 @@ autologin-user=invalid
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 9588c9dc78773886562e1f03536cb8332992261b..daf63cf335767108c813c4378b4da4013224b8a3 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Autologin session starts
@@ -28,9 +29,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
index 1f66bfc80039589c868c869b2186e1689736f333..1849584772edca250c8c8ed655303abeb77fb0f5 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -9,9 +9,10 @@ autologin-user=new-authtok
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)

diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index e742456f0bf764d1d9ce575180984b34f97941c5..2db187a3a2321fc91c879bc5be26ba7a6e6be422 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -9,9 +9,10 @@ autologin-user=always-password
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index aba2eb0475b6f60987000bbed62feda586aac1ec..909c7bbfd9b8ec02dd4674f0b852003687e22b39 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -9,9 +9,10 @@ autologin-user=have-session
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index 242dc7c2c96aa11b18c34bc40aa4263b0bb4e07e..996ddb6f791ea4720bce783e54365ce69f1a8c90 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -28,9 +29,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf
index c0e2a26f7e1c62743d3c9adf10328a15997fce2b..c42c053d7d36f16a84b446681fb05e4aafb3d175 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
@@ -22,9 +23,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 9e3d8b6db9dcfbb24fbd096c067e3014ad14bd4a..8ba1f6b35ba7b28cc91611eb010291d5d7d6cbb8 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -12,6 +12,7 @@ user-session=default
 
 # Greeter starts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START
@@ -22,6 +23,7 @@ user-session=default
 
 # Autologin session starts
 #?XSERVER-1 START VT=8
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 START USER=have-password1

diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index 31f7f60813a827a0c1ab9d1eb160163f1d5d6c83..af1d598d93e274fa7aa70c009b8197b02b8d8621 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index 36ca845a3d199d7f945788f16293644b3ea70132..fc5ec04988d6161da774d6fbc5d2e5dc7d7a38b6 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # XServer starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -28,6 +29,7 @@ user-session=default
 
 # X server restarts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 6484f70d45d1db5e317f458c632baf5068c8b107..de9a49052289ad4da7245bd60ac7b0d774d02d40 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf
index 94f5e60cb7e89d239e0ee28abe9dea6cb42f6fee..ca4719a3214d4e9b67c55eb8bfaa593e9cabe83a 100644 (file)
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index a7b8fe6f5b04fd58b9831fd2997b4dfefbe0c399..4a65dc0d13802ed43ecffdd7e09b0e033fadd94a 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index 890770d595c242a878f688df048b73fa3a4bc536..a9a44bf29a210640b1ae5ea83c7979d1bbf7515b 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index 5d9143d737abdfb8ffb6bc30880a375d08432ec5..7cd8cabfe355a620922b1f1ac2e95bd61a0363f1 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -9,9 +9,10 @@ autologin-user=crash-authenticate
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (authentication crashes)

diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 9d44b3e1103979c8e1a5490b505bf8dbf667908c..39e2006c88247f1704266945d4590cd986ab3607 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
@@ -22,9 +23,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index 98cb0c3b143110be9d0bc8aeaf048485234c6adb..6c08c6700d9f7ff13c7ed39e9c27d07edf52faf4 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
@@ -22,9 +23,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index 82fcdb4b394e1b81713a3ce9a3775c8a4634c9e8..14a960392358661e9a295a7494b8d247dc451800 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
@@ -22,9 +23,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
index 7451d121915b24433529e3fc0c91aacb612afe7c..5f6cd8fc5db515299e67d7932aa1d5c9d2798bf4 100644 (file)
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index 0ead01e07c337a64eed42351b378b6731e3f4b7c..42e14d5a36914c93b0b3719d0a248e8b6d372ebd 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -9,9 +9,10 @@ autologin-user=denied
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)

diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index 11eed1d3ad6f34040c80c3d2efada0701d953bbe..f4a5c823ad5be27212314c4354639a2d2b3e506c 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -9,9 +9,10 @@ autologin-user=expired
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)

diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index aa49ba43f1592c8ac5be936eef3355c1ac7d6388..1d99fbf802d8f64bb00a4a7e4e4531d0746c03c7 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -9,9 +9,10 @@ return-value=1
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter fails to start

diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf
index a8ad842bdfa75141e3daf2dc7cf7fb1e1d00a6ed..123584c5c7d786993211b8578ea0b311b983d3a7 100644 (file)
--- a/tests/scripts/greeter-not-installed.conf
+++ b/tests/scripts/greeter-not-installed.conf
@@ -9,9 +9,10 @@ return-value=1
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Invalid greeter attempted, fails to start

diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf
index ebc4a6f9a15867a6e3b087889596a83c64d5f66f..c1c2f5bd093e44f4ee2bc76d6b2acb163eebddca 100644 (file)
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -9,9 +9,10 @@ greeter-wrapper=test-greeter-wrapper
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter wrapper starts

diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 8930e897493f574a41f3241bc938e10c459fe353..4fba2ebfd06475b5bf1eae133659a301dea08f53 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -26,9 +27,10 @@
 
 # X server restarts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf
index 63a82a13067f8a57c87491c1c5f654bf9315401e..c9d3e8de92655a083d69b9968fdd3dbb57c550ae 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf
index 851ec0c2a9114be4ee88f373ab57511011a63560..159f65bef95f32afddce60745e29b26b43807e3f 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf
index c65892efa2e58edae17644f5f5ed8c523d22af0c..045d0e072566ac306a024cb6b839efe61892e5ce 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf
index 2830b579ed1ddfca9ff84a61d260a05ece1088fc..7c733e05efbe002d3a8cc208108e049a87016e1c 100644 (file)
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf
index 53090872dc6b370dd57e1fd1c416963e577ff846..b6fcd9ed4498e67aa3476c99b932d72ec37ef01f 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -9,9 +9,10 @@ disable-accounts-service=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
index bb3956952a504cf273de38a824936dd6d1bbac44..e07240b61894b02340d89665f0146b84bb9e0c40 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
index e32b359741368e7d2b8b8cd121bf7c501f3afdc1..f22d928c4030838c3200479ef10c1010c5ff9997 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 37a15b52958892108a38de8d47dc6338eb201c99..59ea262b3452052a8a6117650103f05b79486986 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
index 84aa7a13ad43925fbdfe2fc56e1fd759356879dc..1976cb4f7d11dd0b0d8f9707de8626bd11050c3e 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected

diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index 0b9061f9f0a4f68dce3e0da6dc52cb0513ae960b..b4550329e6e09f53f1120f4642696db9f292a86d 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected

diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index f2969f350af395f81b90a68820a71406a9953471..47557362b63b60505c16159eeed0d8e976d8158b 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected

diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf
index 7edf3e230191b010ecf4a860188044692a111194..41474102888a8d78836f3920e55cdc637af38f24 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index a278be536eb6f3fb2fe8a4143bb1bd2f43a353a0..02dfeca01f35b2cf6081f7288cd20ebdbe5cb0e2 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -9,9 +9,10 @@ allow-guest=false
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index 5738e265fef18ff5d96d3f6e3c03e25c1c394cd4..e71347a5a8ad2ea5c03e9e9f682dfeea923985d8 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -9,9 +9,10 @@ guest-account-script=false
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -34,9 +35,10 @@ guest-account-script=false
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index c69c7b9b460c6939b7271b7ee6a93df5f93f16a1..0c5e7a4fb03079e12097e34ce68475e532ac55ad 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -12,9 +12,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -49,9 +50,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
index 86324588b7bd191d13a590bfc7ac3e8e91c97ba0..e6aecf91a50da75fe06b3cbdb4da2c4150908aff 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -9,9 +9,10 @@ guest-account-script=
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 804c3272c499cc7ebf74e827e749733dd4353b65..ad536a5928c4b37335a738fccba0b0886b4d1e91 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -12,9 +12,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf
index 1a12c036b95f21f1e69b241c60f3d5672bac99c0..1a0e3c6d7dcc56618bfb0e2741a41db2ef0e3b95 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index f08eb2e42d3e7476d0b37acee91df99183cd040e..bf53ed30a7d7ab798cadfab9705189076b5fb165 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -31,9 +32,10 @@
 
 # X server restarts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index 231b9fd7446939129518985e96be070af1e22a3d..5500b027c6b867a1b2fea9cf1462770122c86f59 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 31210264fd8342e6aca6c131bc45bdc71c076dc5..1f8e245e53a4377fd47f78f8f5b065912b68ff66 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -42,9 +43,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf
index 9a6d6f6ae94899866b16ffbf13c2d9aa705b2222..1a07f21cf7e03b5a0114a129739f2ed51cf0862f 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
index 9da48179548136e64417facd1b3510085028efec..1e291b25089ce0d4a871d91b09fc3b58af78f11a 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index 929ec67f20efefa43f33f4e75ef1f74fcc2712a7..bf0f6a1b96c6e5da22af5ffd85a2d52fda4e1119 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index 22a0a4fc49efc8d742fe49466f8e1254fa9bf895..4961848a1ddab0a93d3f9a9133d60a567d5bd811 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf
index f823b6a962c4e82dd326b2e2001e757ef5517aa3..a570c60913149b23b49c397b8a161b37bff9da56 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
index 321bbbee16f58106f3bc3cf3c0e178ce89441c34..7987b30edad74f533ae190fe3339c71ace4dd228 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index c1234d45405af36b981d145f6d221405a9686f61..2058e67cf91c6ef807bef8541b4b8c68098d0e87 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index a309f2ae11b29cbdef76ff28d2b5f86aba57f523..04b22509322ca2457d2ac72b07631d7897b742af 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 2ba4eab9adb82977585d99bb59a8715b22e7db8c..3828a62db9eb4657656e3c6a44da97c2bee7b22b 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
index 62ea982d25e1afc716d30dc85001b0dfd4e74325..a624eb0df379ec33dfce37d56f3116fd17949160 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
index fc46bd31f8a8072b1e4c7737fd6b771d8c897d60..b6726cda914851f2eabacc382e3ff46a073da3d2 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf
index 5897c6eeed15d58d58327b73df44c1e5a6b53950..0523b7f9af4f1a9ed22a70fc43886d05034a9469 100644 (file)
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -37,9 +38,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
index 12dd9ddb3880e30a0da4aaadb4ec45babb5fc743..1cbdad9ca81c09f9b2811cde8800dd2fa3dedb1d 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index 867dc25d0196dee82eaae0b558bdd94c04370e7a..2db6ff82fa7223bee12d67991e00fbd16548c4a2 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -42,9 +43,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf
index 2aae4da67843c3c34d17f1a3172b593dd7f01eb6..96159cac7584a65b06b74b71d6a3391f21c68bd0 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index 6cdd19eef0664606c6d70336f1fe1fc629d1939e..e2d193c9d0deefb72e960641b13de7900e0b0af5 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 01d779b14857ec085bd47b4d61e8a114b3b39f04..4c12aa9e29a921942ad7f4c92dc67336a003547d 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # XServer starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
@@ -42,6 +43,7 @@ user-session=default
 
 # X server restarts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index 5a09050ee2b13e33e220630776e41d325589786d..515d335614d95ae408aaff433493587195e97271 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -9,9 +9,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/login1.conf b/tests/scripts/login1.conf
index f00950dcbc778f5ec98cb813d54f2e7eb03a09ac..c09ef2a2c790b890b3561b830b85bde5c61cce05 100644 (file)
--- a/tests/scripts/login1.conf
+++ b/tests/scripts/login1.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf
index b519fdc1565f283ebaac72abeed07e28428555b5..3ee13c4a42ee0f5abedaef9e2f0b976598b4e96e 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
index 6419a7d86f59e6fa90062d1d77d346cff43f27e7..89d7ba50997f5d1fc36e31f0b61d0b2abba33d71 100644 (file)
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -9,9 +9,10 @@ have-config=false
 
 # One X server should start by default
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf
index cd9387682250aa7828b1d6f58c97c7b22f4de73a..3b2ef65e4189c595dacbfc602ff3dba0cd817286 100644 (file)
--- a/tests/scripts/no-console-kit-or-login1.conf
+++ b/tests/scripts/no-console-kit-or-login1.conf
@@ -14,9 +14,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index de916d1c2bbe2ecf268f6a74ee8f8460c5afa75a..3a8d90324c382582e03c15e78cfb9c657300e01f 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf
index eeb0f5cad695a8bf06d789c364b69693e7ed691c..5808851402f00b83af85b6b714a7ad5bce76c446 100644 (file)
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf
index c619978e4be8e5550a5eba59a30fc67f753d447f..21d5459a9cefb49639d8bc07e4068b794ee85509 100644 (file)
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf
index 3780bee4202efdf8e2c87ae0f2719c535ec76ca4..bccc6b62480310e38dee23fbdf5139475f9dbed0 100644 (file)
--- a/tests/scripts/no-login1.conf
+++ b/tests/scripts/no-login1.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf
index 62613088500b642385b9404e9fddf48112542869..a0d9dd9a2bdb58e67ab6c683b9da401f63977a0e 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 04177326c0942457300133cf1a0decf90b1be3aa..c9456c37f69fac7c63f0ff46894b56c022e4cfe7 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
index 43daef1f63bef1baa8660f8b8dcca61700408cf9..2e2ca1a18a7e1b91097a79a63f3e38a15da731b7 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -16,14 +16,15 @@ active=true
 
 # X server starts
 #?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Plymouth quits but keeps image in framebuffer
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
-# LightDM connects to X server
-#?XSERVER-0 ACCEPT-CONNECT
-
 # Greeter starts
 #?GREETER-X-0 START
 #?XSERVER-0 ACCEPT-CONNECT

diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index d1fd2a6df8dcfdd8972f89cb67ef7ef338c63599..ec96e7dd1569585ee50cc78bbcaab8a21673878b 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -13,9 +13,10 @@ active=true
 #?PLYMOUTH HAS-ACTIVE-VT=FALSE
 #?PLYMOUTH QUIT RETAIN-SPLASH=FALSE
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index 77e064129795444d3988689b9125ae109ef451fe..936dbf67428c18847f1b4a293f1e34df0f4579aa 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -9,9 +9,10 @@ disable-console-kit=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf
index f5044b18544e1cc0d8b1ce17cb7bfbc8b752e125..62441878a5ce3d6166b03dd43a7c90dc71539414 100644 (file)
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -9,9 +9,10 @@ disable-login1=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf
index 603ced4241d4a0c4a797cf11f7d9d48dacb940f0..c631d88bf02bc1be16084eb334e5e702ba4b3ecb 100644 (file)
--- a/tests/scripts/power-no-services.conf
+++ b/tests/scripts/power-no-services.conf
@@ -11,9 +11,10 @@ disable-login1=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
index d2ea20bb4fefd7dd2af58c26c800bf12353e9a8f..28e6f8d733635b67dc34ae2620bc79d280e5db18 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index 8875578051380d8dde2864e196ba9e6f535fd1f2..8799c649cddf80451611c9d02d1ef35a85acaac7 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -6,9 +6,10 @@
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf
index e9e391244ab1a20054f9f332623724e17f688f40..80c782d3b27c7f27b51d7bdff65fded415f3c711 100644 (file)
--- a/tests/scripts/script-hook-fail-display-setup.conf
+++ b/tests/scripts/script-hook-fail-display-setup.conf
@@ -9,9 +9,10 @@ display-setup-script=test-script-hook DISPLAY-SETUP 1
 
 # One X server should start by default
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails

diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf
index 701a41a4e5a1c90c809de7e1ee6fe51f0a193034..683b30a48a393e2f9857f3ae8037843bea084756 100644 (file)
--- a/tests/scripts/script-hook-fail-greeter-setup.conf
+++ b/tests/scripts/script-hook-fail-greeter-setup.conf
@@ -9,9 +9,10 @@ greeter-setup-script=test-script-hook GREETER-SETUP 1
 
 # One X server should start by default
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails

diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
index 7c7f6ea6ffb15cef9492f76643a1ce891e679e7b..f07a5c95582acf8acc06a1ce56b640e4fae7a059 100644 (file)
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -10,9 +10,10 @@ autologin-user=have-password1
 
 # One X server should start by default
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index a6e670ba65cc57be5e09fe17de6e5d0b26a9e856..bd33d7e269c8e12d396ab8eb7a11240a9539d9b8 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -14,9 +14,10 @@ user-session=default
 
 # One X server should start by default
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run
@@ -39,9 +40,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run

diff --git a/tests/scripts/session-env.conf b/tests/scripts/session-env.conf
index 8a96b80236ba2918e03974eb82e4e558e30e4cf9..0ce0a4cc39c6fa66d9718360d893299c209da965 100644 (file)
--- a/tests/scripts/session-env.conf
+++ b/tests/scripts/session-env.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index 7f7a12a2676fcce68f64e5740d3a4ff4f10baa84..7273492fb64b3c9d9ef2850e02d939435f78e764 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -29,6 +30,7 @@ user-session=default
 #?*SESSION-X-0 LOGOUT
 #?XSERVER-0 TERMINATE SIGNAL=15
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START
@@ -57,6 +59,7 @@ user-session=default
 #?*SESSION-X-0 LOGOUT
 #?XSERVER-0 TERMINATE SIGNAL=15
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 START

diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf
index f107c624ecf750d6973e9ef5d3a9461dafec6059..996ccba92bb28fd725352d781ec65b5502b8037a 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf
index 57008242f1ee1f9c9bfc79e1d31e04a3c2820ba0..7d1fb6e8305c0db7bc9a2eb7f013acff7f601858 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf
index 37074b67e40838da6fe2595429a147fd7e421c37..ab0536aad9ddccee6f77134caaf5fcb386de6799 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf
index 32eb1125d34a4545bd9220e51a1df48005708274..a831abc5fc17312a0a7f06370dc456bfb7fcaae2 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf
+++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf
@@ -10,6 +10,9 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
@@ -24,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
@@ -55,6 +59,7 @@ user-session=default
 
 # X server starts
 #?XSERVER-1 START VT=8
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 

diff --git a/tests/scripts/switch-to-greeter-new-session-logout-old.conf b/tests/scripts/switch-to-greeter-new-session-logout-old.conf
index b9059fc7ada378b7a16c07a0a716261f2e2910b5..ae515fd88a1e5cb30555d9d8d921cd70ca85e816 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf
+++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf
@@ -10,6 +10,9 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
@@ -24,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
@@ -59,6 +63,7 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 

diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index 6f0f5e7947d76e1d79100c664572c21202e7c3e7..5640565c114eb95b7cc1edc812afa2ea7e84fd98 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
index 913320628cff0884215402920d4d113da331be73..f8b4c54d0827bdb8f61aaa2b9ab8231e35d4f5b0 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
@@ -55,6 +57,7 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 

diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
index be80d0d29b5c3c7f3262a653c284e9594b326606..21af22f9d4239eca387cbe233e3eb0c0dd58f62e 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index 2c19fe3f1ec5b0b6d36dc3542411ff6fd040aa9a..9cd4dd775d97d2bf74571056c4dfbde3b3d207b6 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -26,9 +27,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index b2ae94c2f141537406ea137faa850d76cb937f36..b8af1db0348acff7093430813e8a328a3a4980f3 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -14,9 +14,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Default session starts
@@ -30,9 +31,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Guest account created

diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf
index 4ad54882e5ac61bac1d27e3383d1156dda2a4032..f56db6ca8ff592d4dee9f39be5b19752086552c1 100644 (file)
--- a/tests/scripts/switch-to-user-existing-session.conf
+++ b/tests/scripts/switch-to-user-existing-session.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf
index fdf3976f1c8bf989041740eca5c765e3bf95c6d2..0025017d9830217f38eb1342a3a98d87df41ec7e 100644 (file)
--- a/tests/scripts/switch-to-user-logout.conf
+++ b/tests/scripts/switch-to-user-logout.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -27,9 +28,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts
@@ -45,9 +47,10 @@ user-session=default
 
 # X server starts for greeter
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf
index d1cde5b8e00d9c790674e42182d4f466bfd6b937..e80b95c4e62029d366fe90f35546d580b4244c67 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -27,9 +28,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts

diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index f29a43a19bf78077ceea5433a2a6d04292a2003d..a83c78cd65b646174e73a783eca8612d54c1ebb4 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -27,9 +28,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf
index 6a42bc340a9c7994fdd941b0bb4249daa1eef27d..c17933bec790bc169e210d6f41b24f3c7156ff15 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -11,9 +11,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -27,9 +28,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START VT=8
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts
@@ -43,9 +45,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-2 START VT=9
-#?XSERVER-2 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-2 INDICATE-READY
+#?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
 
 # New session starts

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index 0aa5a672d99cf66118bfd70ae6b8e765c4afef3b..91125a7b758cfa18c2899d3334ea12a008eacd4c 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -13,9 +13,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 39c19b333d693b64b8f7393abc1b15109b2802c1..1d3d148bec38d1cd2d7163594184d19d0b601bc6 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -15,9 +15,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START MIR-ID=0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
-   
-# LightDM connects to X server
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index 716461b6adc6a9f506547c4cd827bda8e85bfe41..2d16d570a1c37ae2c2d82850e107c74f5873b8b2 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -15,9 +15,10 @@ unity-compositor-command=unity-system-compositor --test
 
 # X server starts
 #?XSERVER-0 START MIR-ID=0
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf
index 5c12fc8a3a95f1c32a20e20160f1fead1d12b47a..271049e0e84aa8e6b5e0156655df55bdf6e4b47b 100644 (file)
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -16,9 +16,10 @@ unity-compositor-timeout=1
 
 # X server starts in VT mode
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf
index a9e955452c9bfb2cfff1b85adeef3b8dafc06ec8..bade935377c9518e1e8a11c4752535ccdee33171 100644 (file)
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -16,9 +16,10 @@ type=unity
 
 # X server starts in VT mode
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index e9af08af54128d3f0783d7a5f4aa262c8bcfa1cc..4c7e39c4cb41cd31e8e541e86a11591855f8ff5a 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -14,9 +14,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START MIR-ID=0
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index 879785ea3bbbb7077066026944edd262bb570a18..39a85a945c650d4d48d438ca6841e2b844cff846 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -28,9 +28,10 @@ active=true
 
 # X server starts
 #?XSERVER-0 START MIR-ID=0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
-   
-# LightDM connects to X server
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index c4b0e5f8209a8e0065b02ce1a4dfe71f943931ba..57549cf5f8548225ba660885cdda906a57fc4866 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -15,9 +15,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START MIR-ID=0
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
@@ -34,9 +35,10 @@ user-session=default
 
 # New X server starts
 #?XSERVER-1 START MIR-ID=1
-#?XSERVER-1 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
@@ -68,6 +70,7 @@ user-session=default
 
 # X server starts
 #?XSERVER-1 START MIR-ID=2
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 

diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index ff9d0d617b4c4a85b2cd582671011ec11b96632f..481df50ee9adec2d96048f7437c599af5e865251 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -9,9 +9,10 @@ autologin-user=change-user-invalid
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 3bddb79b7b6a264692b6855793b0f02037dc01b7..db791500885d942e7f718690a247e0a8a8bf7a6b 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf
index db3ddee78e848ac259804357b0c0e6aed516a7ee..d50f1dc36aa2d9469883312c0dbcb1f3c6425e39 100644 (file)
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -12,9 +12,10 @@ log-user-changes=true
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts

diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf
index 53fa4d119edea932f2d0133755b076d05dee0dcf..ac923a8b00c96e628746c1255c8c6b2f59261805 100644 (file)
--- a/tests/scripts/util-path.conf
+++ b/tests/scripts/util-path.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
index 678cd65273a33f51cb2155ea2e6397605f8dc35d..3c4ad3926a478311e223351f45efb3c441152c70 100644 (file)
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -21,11 +21,15 @@ command=Xvnc -option
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE
 
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
 # Negotiate with Xvnc
+#?*XSERVER-0 START-VNC
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
-#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
-#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START

diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf
index 16ecab8539ed433a4ed484a7cb6300936937ccfa..4fdfeed8e1eea22a955e376301c9bdaadbee876d 100644 (file)
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -23,11 +23,15 @@ depth=16
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE
 
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
 # Negotiate with Xvnc
+#?*XSERVER-0 START-VNC
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
-#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
-#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index b47e052c59dec4813b13eeaebf9ef3e4d4072e02..f16c9d83badf82f3489c9f2d808d138030ae9395 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -23,14 +23,17 @@ user-session=default
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
 
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
 # Negotiate with Xvnc
+#?*XSERVER-0 START-VNC
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER-0 INDICATE-READY
-
-# LightDM and vnc-client connect to X server
+# VNC client connects to X server
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
-#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START

diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf
index 57d74832e0993192835c4c63be1c218ab9d9a30d..97bfa1b701d21103e01f91143f6c2e7ee7768bbf 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -23,16 +23,17 @@ user-session=default
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
 
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
 # Negotiate with Xvnc
+#?*XSERVER-0 START-VNC
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER-0 INDICATE-READY
-
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
-# LightDM connects to X server
-#?XSERVER-0 ACCEPT-CONNECT
-
 # Greeter starts and connects to remote X server
 #?GREETER-X-0 START
 #?XSERVER-0 ACCEPT-CONNECT

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index aa895a550eb6e5934d977fe84ea22e98c7716d6e..5868409d10e630e9ac2e8bcfeefdb11d3c3ed68c 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -10,9 +10,10 @@ user-session=default
 
 # X server starts
 #?XSERVER-0 START VT=7
-#?XSERVER-0 INDICATE-READY
 
-# LightDM connects to X server
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts

diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf
index c62fdf263cc5cf5cbbea3cd52bc5f5d50c3df186..214be0e8fe751ec5d7241e25bdbacb7447da7c4e 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -10,6 +10,9 @@ xserver-share=false
 
 # X server starts
 #?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
 
@@ -29,6 +32,9 @@ xserver-share=false
 
 # New X server starts for session
 #?XSERVER-1 START VT=8
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 

diff --git a/tests/src/X.c b/tests/src/X.c
index 6657423861e28800d9cfc855d710f77bec5877d0..34d373c430e0fc5a04195680325d26f1f17f710f 100644 (file)
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -58,26 +58,12 @@ quit (int status)
     g_main_loop_quit (loop);
 }
 
-static void
-indicate_ready (void)
-{
-    void *handler;  
-    handler = signal (SIGUSR1, SIG_IGN);
-    if (handler == SIG_IGN)
-    {
-        status_notify ("XSERVER-%d INDICATE-READY", display_number);
-        kill (getppid (), SIGUSR1);
-    }
-    signal (SIGUSR1, handler);
-}
-
 static void
 signal_cb (int signum)
 {
     if (signum == SIGHUP)
     {
         status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number);
-        indicate_ready ();
     }
     else
     {
@@ -166,8 +152,6 @@ static void
 client_disconnected_cb (XServer *server, XClient *client)
 {  
     g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL);  
-    if (x_server_get_n_clients (server) == 0)
-        indicate_ready ();
 }
 
 static void
@@ -188,6 +172,20 @@ request_cb (const gchar *request)
         kill (getpid (), SIGSEGV);
     }
     g_free (r);
+    r = g_strdup_printf ("XSERVER-%d INDICATE-READY", display_number);
+    if (strcmp (request, r) == 0)
+    {
+        void *handler;
+
+        handler = signal (SIGUSR1, SIG_IGN);
+        if (handler == SIG_IGN)
+        {
+            status_notify ("XSERVER-%d INDICATE-READY", display_number);
+            kill (getppid (), SIGUSR1);
+        }
+        signal (SIGUSR1, handler);
+    }
+    g_free (r);
 }
 
 int
@@ -402,9 +400,6 @@ main (int argc, char **argv)
             quit (EXIT_FAILURE);
     }
 
-    /* Indicate ready if parent process has requested it */
-    indicate_ready ();
-
     g_main_loop_run (loop);
 
     cleanup ();

diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c
index fd374191b51529d7dc5993b709ddf1b1ef12e060..4c1a60a9cd884c0e88a5be26e05b4f6c28c53eb1 100644 (file)
--- a/tests/src/Xvnc.c
+++ b/tests/src/Xvnc.c
@@ -28,19 +28,6 @@ static int display_number = 0;
 /* X server */
 static XServer *xserver = NULL;
 
-static void
-indicate_ready (void)
-{
-    void *handler;  
-    handler = signal (SIGUSR1, SIG_IGN);
-    if (handler == SIG_IGN)
-    {
-        status_notify ("XSERVER-%d INDICATE-READY", display_number);
-        kill (getppid (), SIGUSR1);
-    }
-    signal (SIGUSR1, handler);
-}
-
 static void
 cleanup (void)
 {
@@ -63,7 +50,6 @@ signal_cb (int signum)
     if (signum == SIGHUP)
     {
         status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number);
-        indicate_ready ();
     }
     else
     {
@@ -90,8 +76,6 @@ static void
 client_disconnected_cb (XServer *server, XClient *client)
 {  
     g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL);  
-    if (x_server_get_n_clients (server) == 0)
-        indicate_ready ();
 }
 
 static gboolean
@@ -121,11 +105,35 @@ vnc_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
 static void
 request_cb (const gchar *request)
 {
+    gchar *r;
+
     if (!request)
     {
         g_main_loop_quit (loop);
         return;
     }
+
+    r = g_strdup_printf ("XSERVER-%d INDICATE-READY", display_number);
+    if (strcmp (request, r) == 0)
+    {
+        void *handler;
+
+        handler = signal (SIGUSR1, SIG_IGN);
+        if (handler == SIG_IGN)
+        {
+            status_notify ("XSERVER-%d INDICATE-READY", display_number);
+            kill (getppid (), SIGUSR1);
+        }
+        signal (SIGUSR1, handler);
+    }
+    g_free (r);
+    r = g_strdup_printf ("XSERVER-%d START-VNC", display_number);
+    if (strcmp (request, r) == 0)
+    {
+        /* Send server protocol version to client */
+        g_print ("RFB 003.007\n");
+    }
+    g_free (r);
 }
 
 int
@@ -218,9 +226,6 @@ main (int argc, char **argv)
   
     if (use_inetd)
     {
-        /* Send server protocol version to client */
-        g_print ("RFB 003.007\n");
-
         if (!g_io_add_watch (g_io_channel_unix_new (STDIN_FILENO), G_IO_IN, vnc_data_cb, NULL))
             return EXIT_FAILURE;
     }
@@ -256,9 +261,6 @@ main (int argc, char **argv)
     if (!x_server_start (xserver))
         quit (EXIT_FAILURE);
 
-    /* Indicate ready if parent process has requested it */
-    indicate_ready ();
-
     g_main_loop_run (loop);
 
     cleanup ();