Backport test improvements:

- Make XDMCP tests more controllable
- Make tests use Xorg 1.17 by default
- Add xremote tests
- Add a regression test for xserver-layout option.
- Test xserver-config option

3 files changed, 17 insertions, 17 deletions

diff --git a/tests/scripts/xremote-autologin.conf b/tests/scripts/xremote-autologin.conf
index 45ebaea9..cee1a2df 100644
--- a/tests/scripts/xremote-autologin.conf
+++ b/tests/scripts/xremote-autologin.conf
@@ -19,12 +19,12 @@ xserver-display-number=98
 #?XSERVER-98 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-127.0.0.1:98 START XDG_SEAT=seat0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?SESSION-X-localhost:98 START XDG_SEAT=seat0 DESKTOP_SESSION=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-98 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
+#?SESSION-X-localhost:98 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
+#?SESSION-X-localhost:98 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xremote-login.conf b/tests/scripts/xremote-login.conf
index e8af8311..97b96976 100644
--- a/tests/scripts/xremote-login.conf
+++ b/tests/scripts/xremote-login.conf
@@ -18,28 +18,28 @@ xserver-display-number=98
 #?XSERVER-98 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-127.0.0.1:98 START XDG_SEAT=seat0 XDG_SESSION_CLASS=greeter
+#?GREETER-X-localhost:98 START XDG_SEAT=seat0 XDG_SESSION_CLASS=greeter
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-98 ACCEPT-CONNECT
-#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
-#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
-#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON
+#?GREETER-X-localhost:98 CONNECT-XSERVER
+#?GREETER-X-localhost:98 CONNECT-TO-DAEMON
+#?GREETER-X-localhost:98 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password"
-#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-127.0.0.1:98 START-SESSION
-#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
+#?*GREETER-X-localhost:98 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-localhost:98 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-localhost:98 RESPOND TEXT="password"
+#?GREETER-X-localhost:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-localhost:98 START-SESSION
+#?GREETER-X-localhost:98 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-127.0.0.1:98 START XDG_SEAT=seat0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?SESSION-X-localhost:98 START XDG_SEAT=seat0 DESKTOP_SESSION=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-98 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
+#?SESSION-X-localhost:98 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
+#?SESSION-X-localhost:98 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xserver-config.conf b/tests/scripts/xserver-config.conf
index 673a011f..b3206514 100644
--- a/tests/scripts/xserver-config.conf
+++ b/tests/scripts/xserver-config.conf
@@ -20,7 +20,7 @@ xserver-layout=custom
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER