Make a generic DisplayServer object. Don't connect the daemon to X servers, it could block and is not required

27 files changed, 0 insertions, 36 deletions

diff --git a/tests/scripts/autologin-guest.script b/tests/scripts/autologin-guest.script
index 9085438a..a3bcef00 100644
--- a/tests/scripts/autologin-guest.script
+++ b/tests/scripts/autologin-guest.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=guest
diff --git a/tests/scripts/autologin-logout.script b/tests/scripts/autologin-logout.script
index 8bb29457..604136a4 100644
--- a/tests/scripts/autologin-logout.script
+++ b/tests/scripts/autologin-logout.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Autologin session starts
 SESSION START USER=alice
@@ -20,7 +19,6 @@ SESSION LOGOUT
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/autologin-xserver-crash.script b/tests/scripts/autologin-xserver-crash.script
index 69c4f8fc..7f1cccbb 100644
--- a/tests/scripts/autologin-xserver-crash.script
+++ b/tests/scripts/autologin-xserver-crash.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
@@ -24,7 +23,6 @@ SESSION TERMINATE SIGNAL=15
 # X server restarts and loads greeter
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 GREETER START
 XSERVER :50 ACCEPT-CONNECT
 GREETER CONNECT-XSERVER :50
diff --git a/tests/scripts/autologin.script b/tests/scripts/autologin.script
index 28488ece..d25459bf 100644
--- a/tests/scripts/autologin.script
+++ b/tests/scripts/autologin.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
diff --git a/tests/scripts/greeter-xserver-crash.script b/tests/scripts/greeter-xserver-crash.script
index 26cfe628..1937c734 100644
--- a/tests/scripts/greeter-xserver-crash.script
+++ b/tests/scripts/greeter-xserver-crash.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -23,7 +22,6 @@ XSERVER :50 CRASH
 # X server restarts and loads greeter
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 GREETER START
 XSERVER :50 ACCEPT-CONNECT
 GREETER CONNECT-XSERVER :50
diff --git a/tests/scripts/login-gobject-guest-disabled.script b/tests/scripts/login-gobject-guest-disabled.script
index 42d766c4..902540e6 100644
--- a/tests/scripts/login-gobject-guest-disabled.script
+++ b/tests/scripts/login-gobject-guest-disabled.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-guest-fail-setup-script.script b/tests/scripts/login-gobject-guest-fail-setup-script.script
index 3bc9624f..cf7f84b3 100644
--- a/tests/scripts/login-gobject-guest-fail-setup-script.script
+++ b/tests/scripts/login-gobject-guest-fail-setup-script.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-guest-no-config.script b/tests/scripts/login-gobject-guest-no-config.script
index e2e0b250..018a7abc 100644
--- a/tests/scripts/login-gobject-guest-no-config.script
+++ b/tests/scripts/login-gobject-guest-no-config.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-guest-no-setup-script.script b/tests/scripts/login-gobject-guest-no-setup-script.script
index 3847a1ea..16341994 100644
--- a/tests/scripts/login-gobject-guest-no-setup-script.script
+++ b/tests/scripts/login-gobject-guest-no-setup-script.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-guest.script b/tests/scripts/login-gobject-guest.script
index c687182a..c8c63aef 100644
--- a/tests/scripts/login-gobject-guest.script
+++ b/tests/scripts/login-gobject-guest.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-invalid-user.script b/tests/scripts/login-gobject-invalid-user.script
index 6dded5bf..056a01ab 100644
--- a/tests/scripts/login-gobject-invalid-user.script
+++ b/tests/scripts/login-gobject-invalid-user.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-logout.script b/tests/scripts/login-gobject-logout.script
index e6ee5c75..4509b07d 100644
--- a/tests/scripts/login-gobject-logout.script
+++ b/tests/scripts/login-gobject-logout.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -34,7 +33,6 @@ SESSION LOGOUT
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-manual.script b/tests/scripts/login-gobject-manual.script
index 8b32e526..affa4ac3 100644
--- a/tests/scripts/login-gobject-manual.script
+++ b/tests/scripts/login-gobject-manual.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-no-password.script b/tests/scripts/login-gobject-no-password.script
index e3efdfb3..b31b5c83 100644
--- a/tests/scripts/login-gobject-no-password.script
+++ b/tests/scripts/login-gobject-no-password.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-session-crash.script b/tests/scripts/login-gobject-session-crash.script
index 669ce1cf..d469b291 100644
--- a/tests/scripts/login-gobject-session-crash.script
+++ b/tests/scripts/login-gobject-session-crash.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -34,7 +33,6 @@ SESSION CRASH
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts on X server
 GREETER START
diff --git a/tests/scripts/login-gobject-wrong-password.script b/tests/scripts/login-gobject-wrong-password.script
index 83f68d8e..dc749245 100644
--- a/tests/scripts/login-gobject-wrong-password.script
+++ b/tests/scripts/login-gobject-wrong-password.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/login-gobject-xserver-crash.script b/tests/scripts/login-gobject-xserver-crash.script
index 4577fbd3..e9ea89fb 100644
--- a/tests/scripts/login-gobject-xserver-crash.script
+++ b/tests/scripts/login-gobject-xserver-crash.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # XServer starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -38,7 +37,6 @@ SESSION TERMINATE SIGNAL=15
 # X server restarts and loads greeter
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 GREETER START
 XSERVER :50 ACCEPT-CONNECT
 GREETER CONNECT-XSERVER :50
diff --git a/tests/scripts/login-gobject.script b/tests/scripts/login-gobject.script
index dde89ca9..a1fe4060 100644
--- a/tests/scripts/login-gobject.script
+++ b/tests/scripts/login-gobject.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/no-config.script b/tests/scripts/no-config.script
index 17d3a90b..ed84b550 100644
--- a/tests/scripts/no-config.script
+++ b/tests/scripts/no-config.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # One X server should start by default
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/plymouth-active-vt.script b/tests/scripts/plymouth-active-vt.script
index c6fa6a5c..cbeaef06 100644
--- a/tests/scripts/plymouth-active-vt.script
+++ b/tests/scripts/plymouth-active-vt.script
@@ -13,7 +13,6 @@ PLYMOUTH DEACTIVATE
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
 PLYMOUTH QUIT RETAIN-SPLASH=TRUE
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/plymouth-inactive-vt.script b/tests/scripts/plymouth-inactive-vt.script
index 0e583309..de17942b 100644
--- a/tests/scripts/plymouth-inactive-vt.script
+++ b/tests/scripts/plymouth-inactive-vt.script
@@ -12,7 +12,6 @@ PLYMOUTH QUIT RETAIN-SPLASH=FALSE
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/plymouth-xserver-fail-start.script b/tests/scripts/plymouth-xserver-fail-start.script
index d10f417a..68fe39ae 100644
--- a/tests/scripts/plymouth-xserver-fail-start.script
+++ b/tests/scripts/plymouth-xserver-fail-start.script
@@ -19,7 +19,6 @@ PLYMOUTH QUIT RETAIN-SPLASH=FALSE
 # X server starts again
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/switch-to-greeter.script b/tests/scripts/switch-to-greeter.script
index 4fe6424b..1630bb3e 100644
--- a/tests/scripts/switch-to-greeter.script
+++ b/tests/scripts/switch-to-greeter.script
@@ -7,7 +7,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -35,7 +34,6 @@ RUNNER SWITCH-TO-GREETER
 # New X server starts
 XSERVER :51 START
 XSERVER :51 INDICATE-READY
-XSERVER :51 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
diff --git a/tests/scripts/switch-to-guest.script b/tests/scripts/switch-to-guest.script
index f24a58f4..88f0e950 100644
--- a/tests/scripts/switch-to-guest.script
+++ b/tests/scripts/switch-to-guest.script
@@ -8,7 +8,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -28,7 +27,6 @@ GREETER TERMINATE SIGNAL=15
 # New X server starts
 XSERVER :51 START
 XSERVER :51 INDICATE-READY
-XSERVER :51 ACCEPT-CONNECT
 
 # Guest session starts
 SESSION START USER=guest
diff --git a/tests/scripts/switch-to-user.script b/tests/scripts/switch-to-user.script
index 78a4f9c9..7d0cc950 100644
--- a/tests/scripts/switch-to-user.script
+++ b/tests/scripts/switch-to-user.script
@@ -8,7 +8,6 @@ RUNNER DAEMON-START
 # X server starts
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
@@ -28,7 +27,6 @@ RUNNER SWITCH-TO-USER USERNAME=alice
 # New X server starts
 XSERVER :51 START
 XSERVER :51 INDICATE-READY
-XSERVER :51 ACCEPT-CONNECT
 
 # New greeter starts
 GREETER START
diff --git a/tests/scripts/xdmcp-login.script b/tests/scripts/xdmcp-login.script
index c127116e..334346a4 100644
--- a/tests/scripts/xdmcp-login.script
+++ b/tests/scripts/xdmcp-login.script
@@ -15,7 +15,6 @@ XSERVER :98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
 XSERVER :98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
 XSERVER :98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME=""
 XSERVER :98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS"
-XSERVER :98 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 GREETER START
diff --git a/tests/scripts/xserver-fail-start.script b/tests/scripts/xserver-fail-start.script
index 252ff4a2..078380c0 100644
--- a/tests/scripts/xserver-fail-start.script
+++ b/tests/scripts/xserver-fail-start.script
@@ -10,7 +10,6 @@ XSERVER :50 EXIT CODE=1
 # X server starts again
 XSERVER :50 START
 XSERVER :50 INDICATE-READY
-XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START