Override XCB to make X tests reliable and predictable. Had to remove keyboard layout...

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3cb70fc9c6550fb46b948080592e537a4cab4e37..ffb386567e95fd4ad0f7d558ced989a1ab7f3b8e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,8 +51,6 @@ TESTS = \
        test-user-renamed-invalid \
        test-keyboard-layout \
        test-no-keyboard-layout \
-       test-default-keyboard-layout \
-       test-keyboard-variants \
        test-language \
        test-no-language \
        test-language-no-accounts-service \
@@ -259,7 +257,6 @@ EXTRA_DIST = \
        scripts/cred-error.conf \
        scripts/cred-expired.conf \
        scripts/cred-unavail.conf \
-       scripts/default-keyboard-layout.conf \
        scripts/denied.conf \
        scripts/expired.conf \
        scripts/greeter-fail-start.conf \
@@ -270,7 +267,6 @@ EXTRA_DIST = \
        scripts/home-dir-on-authenticate.conf \
        scripts/home-dir-on-session.conf \
        scripts/keyboard-layout.conf \
-       scripts/keyboard-variants.conf \
        scripts/language.conf \
        scripts/language-no-accounts-service.conf \
        scripts/lock-seat.conf \

diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index 95f67c7eb7d9aa13cbf2bc5f27178fefa890c8ed..f23b3f5fde53ee4715603fcc4c810db789505635 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -4,7 +4,6 @@
 
 [LightDM]
 guest-account-script=false
-minimum-display-number=50
 
 [SeatDefaults]
 autologin-guest=true
@@ -12,23 +11,23 @@ autologin-guest=true
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (guest account attempts to start and fails)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 2083e1f7b04f97ad8a76c9479b08b8af4c45ad4e..6048a03bf03767c8c07616945b1f369ad6b0bdc0 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -2,9 +2,6 @@
 # Check automatically logs in guest while keeping a greeter up
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-guest=true
 autologin-in-background=true
@@ -12,29 +9,29 @@ autologin-in-background=true
 #?RUNNER DAEMON-START
 
 # Greeter starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Guest session starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
-#?SESSION-X-51 START USER=guest-.*
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=guest-.*
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 1bac09a3d8849a3ab2028158b48d37f92150c864..2f643185fc4d9f31d640ae4ab457e7768510fdc9 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -2,54 +2,51 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-guest=true
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout of session
-#?*SESSION-X-50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
index 70775c5620055f746836dbfa4d7be86df526eb04..1d449618e9a5911d91c3c9eee4bccf17fffd3367 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -2,9 +2,6 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-guest=true
 autologin-user-timeout=1
@@ -12,39 +9,39 @@ autologin-user-timeout=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Autologin timer expires
-#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
+#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED
 
 # Trigger autologin
-#?*GREETER-X-50 AUTHENTICATE-AUTOLOGIN
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index c94bde08f2f7820bd7d4023c184494cba5c3eab3..0095af55d68b2ea663a390bd91ff66c12a1e11ac 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -2,33 +2,30 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-guest=true
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest.*
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index 89b86ad747a58444779e322e1872f01327b39cc8..2b3a9700869e0233971b2309f515812c0865b8de 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -2,9 +2,6 @@
 # Check automatically logs in default user while keeping a greeter up
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 autologin-in-background=true
@@ -12,27 +9,27 @@ autologin-in-background=true
 #?RUNNER DAEMON-START
 
 # Greeter starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Autologin user starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 START USER=have-password1
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 START USER=have-password1
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index 1b8c31c428820419e8fc26993352eabb1a7e0040..62fe206ddd6d509e44f203c4ba9bcdd38a73289c 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -2,9 +2,6 @@
 # Check autologin fails if invalid session configured and returns to greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 user-session=invalid
@@ -12,23 +9,23 @@ user-session=invalid
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (session fails to start)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index f1daa823e79f82d7263acef42b60fd0d90af8e76..25a8329d8f074d31a86f97bbf4af17a97c707a07 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -2,32 +2,29 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=invalid
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 43f7022ea3c2d400ab149d65205792c31df70f58..ba841c7c058be38419c37af0074b7731cec43ff4 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -2,51 +2,48 @@
 # Check logging out after autologin returns to greeter and doesn't autologin again
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Autologin session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION-X-50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Wait in case the greeter tries to log in immediately
 #?*WAIT
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
index 403165c0249e5161e40926846fd43b760aaa1022..4407f49bd76b6e2801874ac05f7156691107efcc 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -2,32 +2,29 @@
 # Check automatic login stops if a password change is required
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=new-authtok
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index dca7ce06a9fcf675eb483df6cef04e621684808a..8f1c3f45b819a151340311a412fe19a3eaef5521 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -2,32 +2,29 @@
 # Check automatic login stops if an account prompts for a password
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=always-password
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index 445c9a64898828faa471ee95b7fc8c09c7bf52c9..3cad3cf5621c3d0e9036f57e6329b38c09733511 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -2,28 +2,25 @@
 # Check automatically logs in and picks correct session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-session
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START NAME=alternative USER=have-session
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START NAME=alternative USER=have-session
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index 9c39d1a21f88f65eff28bec4968bf7842a9bae68..f843fc550aa6e9a889d701fdb25cd5dac1934229 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -2,48 +2,45 @@
 # Check if session crashes then returned to greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Crash session
-#?*SESSION-X-50 CRASH
+#?*SESSION-X-0 CRASH
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf
index ccd6e30d9fd31b10d35f38b59d58ff0b2a56a101..0b72aacc460e1ffb2eed3ef0af44b282badd45cb 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -2,42 +2,39 @@
 # Check automatic login stops if an account can't open a session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=session-error
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index a17f68a0ae174508a0b49ce503f9d83155b5a209..0e6b8f5a3a947a8333e4b9b31ff2e46c455b5d7a 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -2,9 +2,6 @@
 # Check automatically logs in default user with timeout and in-background set
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 autologin-user-timeout=1
@@ -13,32 +10,32 @@ autologin-in-background=true
 #?RUNNER DAEMON-START
 
 # Greeter starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Guest session starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 START USER=have-password1
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 START USER=have-password1
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
-#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
-#?*GREETER-X-50 AUTHENTICATE-AUTOLOGIN
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED
+#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index 32034d5af79369600681910016811c5032727d27..abb99c2e31eb44f0d9f564cf10730d5e764dfaa6 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -2,9 +2,6 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 autologin-user-timeout=1
@@ -12,35 +9,35 @@ autologin-user-timeout=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Autologin timer expires
-#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
+#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED
 
 # Trigger autologin
-#?*GREETER-X-50 AUTHENTICATE-AUTOLOGIN
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index 7b50925198bbf20e3071684e8ac5045f186ea6f2..6fc243215c6e8cedda9fe14464999a718a46099d 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -2,45 +2,42 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # XServer starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Crash X server
-#?*XSERVER-50 CRASH
+#?*XSERVER-0 CRASH
 
 # User session is terminated
-#?SESSION-X-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index d7f8581593e704e6e392c050f878db9628c2ac1a..10c5388c1ac0bbd7ac84231600831294c063b1ae 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -2,28 +2,25 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf
index 628c3ded1bcec9d0a6d9a0c978bbe19f830e351a..272131757106e6f0650052e6381318ddd24940ca 100644 (file)
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -2,38 +2,35 @@
 # Check can cancel authentication
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Start authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Cancel authentication
-#?*GREETER-X-50 CANCEL-AUTHENTICATION
+#?*GREETER-X-0 CANCEL-AUTHENTICATION
 
 # Start new authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password2
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index aefc939b18cd284836b9d44f93c3861c5e88264c..f2ec30e5d4c577d31e2c0321d0afb0649fbfacaa 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -2,36 +2,33 @@
 # Check can change authentication
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Start authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Change user authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password2
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index 6125a9fe53c9c1e0e462e09260c8e79244755409..38eaa9ea330fce5a15c7501fa412ddc3c7f1694d 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -5,32 +5,29 @@
 [test-runner-config]
 disable-login1=true
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check environment variable
-#?*SESSION-X-50 READ-ENV NAME=XDG_SESSION_COOKIE
-#?SESSION-X-50 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:50
+#?*SESSION-X-0 READ-ENV NAME=XDG_SESSION_COOKIE
+#?SESSION-X-0 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:0
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index 9dd0ed608123ddf646247ea1acac09575aa214f4..84cc3a3df35f583ec828313daff77b56dc67d6c0 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -2,32 +2,29 @@
 # Check authentication crash on autologin is handled
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=crash-authenticate
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (authentication crashes)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 403e963bc9ebdf1cccdd64a3278e3a6d3f37e1d8..fe1c245826ec9bcedb4d315e068d0c3dd124bbf6 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -2,42 +2,39 @@
 # Check automatic login stops if an account can't establish credentials
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=cred-error
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index 057ee8fcf5f7a0aa760bfef4456755a6bf05b4f2..99e3bb421243f882458ceb2947d63c95ea4c8f97 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -2,42 +2,39 @@
 # Check automatic login stops if an account has expired credentials
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=cred-expired
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index 7fd8c9ba9df64187bccc9da7ce593e2f143792e2..2cd0e088355daf87f192cbd91c87dc3254c2f4d0 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -2,42 +2,39 @@
 # Check automatic login stops if an account can't access credentials
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=cred-unavail
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/default-keyboard-layout.conf b/tests/scripts/default-keyboard-layout.conf
deleted file mode 100644 (file)
index 8da4258..0000000
--- a/tests/scripts/default-keyboard-layout.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Check returns correct layout for a user
-#
-
-[LightDM]
-minimum-display-number=50
-
-[test-xserver-config]
-keyboard-layout=ara
-keyboard-variant=azerty
-
-#?RUNNER DAEMON-START
-
-# X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-
-# LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
-
-# Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
-
-# Correct layout is found
-#?*GREETER-X-50 LOG-LAYOUT
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 LOG-LAYOUT LAYOUT='ara  azerty'
-
-# Cleanup
-#?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index a28d48574d107a40cfaceea1066c220150609de0..8ba7d6a452bc48a958bd94b6cb44c25bee53a583 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -2,32 +2,29 @@
 # Check automatic login stops if an account is denied access
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=denied
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index 0d409097f2bb39692409f6c31490c69c0c4ac551..b08e5c0e13540cf933e482d8d1a55ea9275e2a14 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -2,32 +2,29 @@
 # Check automatic login stops if an account is expired
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=expired
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index a1d96bcac59294d916962dfc45aff0335542bb30..5e131d7a37fadf6fa926ac4d832045887c24a720 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -2,27 +2,24 @@
 # Check that LightDM quits when the greeter fails to start
 #
 
-[LightDM]
-minimum-display-number=50
-
 [test-greeter-config]
 return-value=1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter fails to start
-#?GREETER-X-50 START
-#?GREETER-X-50 EXIT CODE=1
+#?GREETER-X-0 START
+#?GREETER-X-0 EXIT CODE=1
 
 # X server stopped
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Daemon stops with error
 #?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf
index c905e7fff155005412126bf59410e1e41be86e1f..b05907131ad75ab2475a4ed5c9cff8617714b329 100644 (file)
--- a/tests/scripts/greeter-not-installed.conf
+++ b/tests/scripts/greeter-not-installed.conf
@@ -2,25 +2,22 @@
 # Check that LightDM quits when the greeter does not exist
 #
 
-[LightDM]
-minimum-display-number=50
-
 [test-greeter-config]
 return-value=1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Invalid greeter attempted, fails to start
 
 # X server stopped
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Daemon stops with error
 #?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 43c16f27494890a040701a80e2a0f9a0bf17d208..251b1bc6a1ded81849986d9015dc7a8f122abfd4 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -2,47 +2,44 @@
 # Check X server crashing while running greeter returns to the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Crash X server
-#?*XSERVER-50 CRASH
+#?*XSERVER-0 CRASH
 
 # Greeter quits
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf
index c6350d18f833da3362e128fb2c746fe13e51afe9..82873727f9e0bcf774728276aae0e412005332a3 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -2,32 +2,29 @@
 # Check group membership is correctly set up
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=group-member
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=group-member
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=group-member
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check we belong to the group for our user and the special group set by PAM
-#?*SESSION-X-50 LIST-GROUPS
-#?SESSION-X-50 LIST-GROUPS GROUPS=group-member,test-group
+#?*SESSION-X-0 LIST-GROUPS
+#?SESSION-X-0 LIST-GROUPS GROUPS=group-member,test-group
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf
index 9db8d48b5e6a4ebf44b89c6c965bf742536745a9..f440bfe2e3ba7e8e12b04a605c6b2f49333af882 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -2,28 +2,25 @@
 # Check works for users who have their home directory created after authentication
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=mount-home-dir
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=mount-home-dir
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=mount-home-dir
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf
index 23ee808207079ad132122d792ea57f214b3bf3fe..cdd3254e4dba8ecf1739bf336a0517b1646edcc0 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -2,28 +2,25 @@
 # Check works for users who have their home directory created when the session is opened
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=make-home-dir
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=make-home-dir
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=make-home-dir
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf
index 66b3a0887ee8736a86e7ae79961e43335e5f1acf..d7e83611dea37238b63abc1d5b3bc3f867e79968 100644 (file)
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -2,36 +2,33 @@
 # Check returns correct layout for a user
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Correct layout is found
-#?*GREETER-X-50 LOG-LAYOUT USERNAME=have-layout
-#?GREETER-X-50 LOG-LAYOUT USERNAME=have-layout LAYOUT='us'
-#?*GREETER-X-50 LOG-LAYOUT USERNAME=have-layouts
-#?GREETER-X-50 LOG-LAYOUT USERNAME=have-layouts LAYOUT='fr     oss'
-#?*GREETER-X-50 LOG-LAYOUTS USERNAME=have-layouts
-#?GREETER-X-50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='fr    oss'
-#?GREETER-X-50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='ru'
+#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-layout
+#?GREETER-X-0 LOG-LAYOUT USERNAME=have-layout LAYOUT='us'
+#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-layouts
+#?GREETER-X-0 LOG-LAYOUT USERNAME=have-layouts LAYOUT='fr      oss'
+#?*GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts
+#?GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='fr     oss'
+#?GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='ru'
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/keyboard-variants.conf b/tests/scripts/keyboard-variants.conf
deleted file mode 100644 (file)
index c2e3ee8..0000000
--- a/tests/scripts/keyboard-variants.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Check returns variants as well as normal layouts
-#
-
-[LightDM]
-minimum-display-number=50
-
-#?RUNNER DAEMON-START
-
-# X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-
-# LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
-
-# Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
-
-# Correct layouts are found
-#?*GREETER-X-50 LOG-VARIANTS LAYOUT=fr
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr nodeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr sundeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr oss'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr oss_latin9'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr oss_nodeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr oss_sundeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr latin9'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr latin9_nodeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr latin9_sundeadkeys'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr bepo'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr bepo_latin9'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr dvorak'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr mac'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr bre'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr oci'
-#?GREETER-X-50 LOG-VARIANTS LAYOUT='fr geo'
-
-# Cleanup
-#?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf
index 871a16176e4774290e7b71605205c41a98c64569..195dcdc8034457d889fd1eeae177cc3b91762ad9 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -5,31 +5,28 @@
 [test-runner-config]
 disable-accounts-service=true
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Correct layout is found
-#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-language
-#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU.utf8
+#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-language
+#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU.utf8
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
index ab10ef45d757d467cb311a7441beb3054b1d1788..e5dc220a8ce70b2410f66d689a9b8f8e63aefe1f 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -2,31 +2,28 @@
 # Check returns correct language for a user
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Correct layout is found
-#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-language
-#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
+#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-language
+#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
index 1104987a554b70b2bb433cbf1a5cd68c0f16126d..de3e2baa176dfa77d4b04d900381f28e95258806 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -2,59 +2,56 @@
 # Check can lock a seat from D-Bus and can return to it
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Lock the seat
-#?*SESSION-X-50 LOCK-SEAT
-#?SESSION-X-50 LOCK-SEAT
+#?*SESSION-X-0 LOCK-SEAT
+#?SESSION-X-0 LOCK-SEAT
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
-#?GREETER-X-51 LOCK-HINT
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 LOCK-HINT
 
 
 # Login as existing user
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
 
 # Greeter and X server stop
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 48fd0adffcb3ca57f6674261392babbe1b8224c9..1ffc41ed90ff054ec4cb60a986e4d6f37b7ef939 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -2,49 +2,46 @@
 # Check can lock a seat from D-Bus
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Lock the seat
-#?*SESSION-X-50 LOCK-SEAT
-#?SESSION-X-50 LOCK-SEAT
+#?*SESSION-X-0 LOCK-SEAT
+#?SESSION-X-0 LOCK-SEAT
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
-#?GREETER-X-51 LOCK-HINT
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 LOCK-HINT
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
index 59f040f41282651261290dc343e07b0e7d543464..87c2810b6533a30940ec690161dfbf2604903a68 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -2,50 +2,47 @@
 # Check can lock a session from D-Bus. The session has no password so check it doesn't automatically log back in
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=no-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Lock the session
-#?*SESSION-X-50 LOCK-SESSION
-#?SESSION-X-50 LOCK-SESSION
+#?*SESSION-X-0 LOCK-SESSION
+#?SESSION-X-0 LOCK-SESSION
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
-#?GREETER-X-51 SELECT-USER-HINT USERNAME=no-password1    
-#?GREETER-X-51 LOCK-HINT
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 SELECT-USER-HINT USERNAME=no-password1    
+#?GREETER-X-1 LOCK-HINT
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index 54fc525930bbf37958906a5ea09399c02bc93931..08d29d17bbff30b2b6af9a0ef81f7398337ae3d5 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -2,59 +2,56 @@
 # Check can lock a session from D-Bus and can return to it
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Lock the session
-#?*SESSION-X-50 LOCK-SESSION
-#?SESSION-X-50 LOCK-SESSION
+#?*SESSION-X-0 LOCK-SESSION
+#?SESSION-X-0 LOCK-SESSION
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
-#?GREETER-X-51 SELECT-USER-HINT USERNAME=have-password1    
-#?GREETER-X-51 LOCK-HINT
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1    
+#?GREETER-X-1 LOCK-HINT
 
 # Login as existing user
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
 
 # Greeter and X server stop
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index 1fb9cee0c6420b1b5fe421c7912c8fa7e6249a5e..c832110bdf4a84c28a9fe9bd5bcce885794656e3 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -2,50 +2,47 @@
 # Check can lock a session from D-Bus
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Lock the session
-#?*SESSION-X-50 LOCK-SESSION
-#?SESSION-X-50 LOCK-SESSION
+#?*SESSION-X-0 LOCK-SESSION
+#?SESSION-X-0 LOCK-SESSION
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
-#?GREETER-X-51 SELECT-USER-HINT USERNAME=have-password1    
-#?GREETER-X-51 LOCK-HINT
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1    
+#?GREETER-X-1 LOCK-HINT
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf
index 2a4be4f256d4dfca95afd0ab7a3aa109dcf177ea..f12a11f58d8a291359eea76789d02d1aa95ec601 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -2,32 +2,29 @@
 # Check returned to greeter when authentication crashes
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Attempt to login, but authentication crashes
-#?*GREETER-X-50 AUTHENTICATE USERNAME=crash-authenticate
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=crash-authenticate
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index 26f04a9d11387d62a21848b213ef9a40e5e4e47d..cb53acff2253135f20e720dca20dbd4a21be55b0 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -2,34 +2,31 @@
 # Check can't login to guest if account disabled
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 allow-guest=false
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER-X-50 AUTHENTICATE-GUEST
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE-GUEST
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index eb48a0752c62682732a32b9c2bb060321ffca2eb..4d15aed0a81f066cb25bb0aff3c3ead9fa379f8a 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -4,51 +4,50 @@
 
 [LightDM]
 guest-account-script=false
-minimum-display-number=50
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER-X-50 AUTHENTICATE-GUEST
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE-GUEST
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # (guest account attempts to start and fails)
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 488c7a9c994d649be8b8602d9dc1653578d5039c..4be924802000527ed7374ca548e5c5cda8e0a66e 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -2,64 +2,61 @@
 # Check automatically logs in default user
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER-X-50 AUTHENTICATE-GUEST
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE-GUEST
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout of session
-#?*SESSION-X-50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
index d102f3e345a7c9eda0426e9b0780b4788f56ac3e..cdad799b66cc3599ca89498e1c6deee3d460a57c 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -4,30 +4,29 @@
 
 [LightDM]
 guest-account-script=
-minimum-display-number=50
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER-X-50 AUTHENTICATE-GUEST
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE-GUEST
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index bc27d4737ad72d44289653b21260f0f715a18b02..020ddcaf40eb29fddbdd2ce407ae9241d5b17d40 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -2,42 +2,39 @@
 # Check can login as guest (not prompted for password)
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER-X-50 AUTHENTICATE-GUEST
-#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE-GUEST
+#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf
index 51fa4b0ef2a56a60bd65534c2610dad046ff42ce..d4b0b38d4cf22d7f5266d4b6fbdc5ca8c7f6d07a 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -2,36 +2,33 @@
 # Check a PAM informational message on login is passed to a greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER-X-50 AUTHENTICATE USERNAME=info-prompt
-#?GREETER-X-50 SHOW-MESSAGE TEXT="Welcome to LightDM"
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=info-prompt
+#?GREETER-X-0 SHOW-MESSAGE TEXT="Welcome to LightDM"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index 4c89234638f10c183d2514e65d47a1e15380b5dc..058ea64de14659692e700328f7f5d496ad319cad 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -2,52 +2,49 @@
 # Check can login
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into an account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION SESSION=invalid
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION SESSION=invalid
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # X server stops, the session is invalid
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index e1e54a37fab16be19392b6763e8ec9964739b2f7..04ba79be3d60f3bd3d9176080d115e0542acadf5 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -2,33 +2,30 @@
 # Check can't login with invalid user (but still prompted for password)
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as invalid user
-#?*GREETER-X-50 AUTHENTICATE USERNAME=notauser
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=notauser AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=notauser
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=notauser AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 34011f5da8d40f9b317786a848e8a7a333c68ad2..5b50d7fac49a7cc7b4322da767f19ccd33f2c6f5 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -2,60 +2,57 @@
 # Check logging out returns to the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION-X-50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf
index d3bb18f8c91dc97eb99d7d8bd0ff1b57b4fea09f..74ac5c95ad842a8b950016be47e20b69f33b3b80 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -2,33 +2,30 @@
 # Check can handle very long password being provided
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in with a very long username
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
index 9a358c6f60cb6a305dbb450fb87f94fe07ea682a..85b77271f6eb8a35d144b8f82ef454eadcfd67b7 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -2,33 +2,30 @@
 # Check can handle very long username being provided
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in with a very long username
-#?*GREETER-X-50 AUTHENTICATE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index dc41cc9fef35ddd4b01c9dfe663f7bf991f06624..9de99876c8f3857ddc72240e532aba136c9f8f71 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -2,40 +2,37 @@
 # Check when logging in manually the previous session is restored
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as account with a previous session, but let lightdm prompt for a username
-#?*GREETER-X-50 AUTHENTICATE
-#?GREETER-X-50 SHOW-PROMPT TEXT="login:"
-#?*GREETER-X-50 RESPOND TEXT="have-session"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE
+#?GREETER-X-0 SHOW-PROMPT TEXT="login:"
+#?*GREETER-X-0 RESPOND TEXT="have-session"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START NAME=alternative USER=have-session
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START NAME=alternative USER=have-session
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index b9533610e5fe19ac25c05ad433407ff365cf8198..6baa80521e4be682d14347a11f9d0210a29c2f20 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -2,42 +2,39 @@
 # Check can login without a username, and is prompted for one
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as have-password1, but let lightdm prompt for a username
-#?*GREETER-X-50 AUTHENTICATE
-#?GREETER-X-50 SHOW-PROMPT TEXT="login:"
-#?*GREETER-X-50 RESPOND TEXT="have-password1"
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE
+#?GREETER-X-0 SHOW-PROMPT TEXT="login:"
+#?*GREETER-X-0 RESPOND TEXT="have-password1"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf
index ed210ad048bf9a259b41a5a94c934223830e5871..469c4add773ae897bd29d677212acca8bcf7e086 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -2,38 +2,35 @@
 # Check multiple PAM informational messages on login are passed to a greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER-X-50 AUTHENTICATE USERNAME=multi-info-prompt
-#?GREETER-X-50 SHOW-MESSAGE TEXT="Welcome to LightDM"
-#?GREETER-X-50 SHOW-MESSAGE TEXT="This is an error"
-#?GREETER-X-50 SHOW-MESSAGE TEXT="You should have seen three messages"
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=multi-info-prompt
+#?GREETER-X-0 SHOW-MESSAGE TEXT="Welcome to LightDM"
+#?GREETER-X-0 SHOW-MESSAGE TEXT="This is an error"
+#?GREETER-X-0 SHOW-MESSAGE TEXT="You should have seen three messages"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
index 58e2a3776f28a741065ebe5e26c72f6a16a5163f..6178eeb3a9ec696835ec95a066ca2eca61af3d7e 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -2,37 +2,34 @@
 # Check multiple PAM informational messages on login are passed to a greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER-X-50 AUTHENTICATE USERNAME=multi-prompt
-#?GREETER-X-50 SHOW-PROMPT TEXT="Favorite Color:"
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=multi-prompt
+#?GREETER-X-0 SHOW-PROMPT TEXT="Favorite Color:"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER-X-50 RESPOND TEXT="blue"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-0 RESPOND TEXT="blue"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index f4689c5bace4b30fd4619d649459a60cf5518dd3..af7ce220097779bae4866d64c351ec2498127ed1 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -2,40 +2,37 @@
 # Check prompted to change password
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account that requires as password change
-#?*GREETER-X-50 AUTHENTICATE USERNAME=new-authtok
-#?GREETER-X-50 SHOW-PROMPT TEXT="Enter new password:"
-#?*GREETER-X-50 RESPOND TEXT="New password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok
+#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password:"
+#?*GREETER-X-0 RESPOND TEXT="New password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=new-authtok
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=new-authtok
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index 3aa2fe8c4eb644c248b3e5b4d20513cda4cd8b2f..ab4aa81daaebd90a57380237755fb43bffcf569a 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -2,38 +2,35 @@
 # Check can login without password for accounts that do not have a password
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account without a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=no-password1
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 23b6bc3fb38cc6f16c784ef834d097dd43bd0e9b..de0e43715322e557d70975fe76c6bbee5b37129a 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -2,42 +2,39 @@
 # Check we handle conversations during each PAM method
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=log-pam
-#?GREETER-X-50 SHOW-MESSAGE TEXT="pam_authenticate"
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 SHOW-MESSAGE TEXT="pam_acct_mgmt"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=log-pam
+#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_authenticate"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_acct_mgmt"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=log-pam
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=log-pam
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
index df91163af207808a861dc50c35cf31ae88e8b7f2..ae50986af80737b8d119f635e01d09da17e4774d 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -2,40 +2,37 @@
 # Check can login and pick an alternative session
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login as have-password1
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION SESSION=alternative
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION SESSION=alternative
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START NAME=alternative USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START NAME=alternative USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
index be88e19edf89efb5946a9d636c557f57f044233a..7caf0a8cebb8f5a986b8fbb7f338d2ecf5da34df 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -2,38 +2,35 @@
 # Check when logging in the previous session is loaded
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a previously chosen session
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-session
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-session
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START NAME=alternative USER=have-session
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START NAME=alternative USER=have-session
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
index bbef8e19160ce95e89998cb717f5ad9e8bb1d60f..44f48cebbbd8925db494805114092f115e8c8be3 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -2,48 +2,45 @@
 # Check can login without a username, and is prompted for one
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Start remote authentication
-#?*GREETER-X-50 AUTHENTICATE-REMOTE SESSION=test-remote
+#?*GREETER-X-0 AUTHENTICATE-REMOTE SESSION=test-remote
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Get remote credentials
-#?GREETER-X-50 SHOW-PROMPT TEXT="remote-login:"
-#?*GREETER-X-50 RESPOND TEXT="remote-user"
-#?GREETER-X-50 SHOW-PROMPT TEXT="remote-password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 SHOW-PROMPT TEXT="remote-login:"
+#?*GREETER-X-0 RESPOND TEXT="remote-user"
+#?GREETER-X-0 SHOW-PROMPT TEXT="remote-password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=guest-.*
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=guest-.*
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index 63a8e2624037f4230511b6457f24a9028b82fa42..935673f98c7418d3865ff18e4a1f5d5fc99bb0c7 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -2,60 +2,57 @@
 # Check if session crashes then returned to greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into an account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Crash session
-#?*SESSION-X-50 CRASH
+#?*SESSION-X-0 CRASH
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf
index 743e580018a4a88c01f73b069be7a15675c3663d..762e0bb7afe4a274669ad1811d39c67dd3e0682e 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -2,35 +2,32 @@
 # Check can login with two factor
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=two-factor
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 SHOW-PROMPT TEXT="OTP:"
-#?*GREETER-X-50 RESPOND TEXT="otp"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=two-factor AUTHENTICATED=TRUE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=two-factor
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 SHOW-PROMPT TEXT="OTP:"
+#?*GREETER-X-0 RESPOND TEXT="otp"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=two-factor AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index ab5387bbd09925ae7f8c57f6edba5fa8da3c18b4..27bc938c53fd9b50b53e3be53b583004484a122f 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -2,34 +2,31 @@
 # Check can't login with an invalid password
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Login with invalid password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="rubbish"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="rubbish"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 58b30dc9ad74bc1ff5a8545b57e1cf09b7395a56..2c18b145d262a8a6b56a422db4488c07853809c9 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -2,57 +2,54 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # XServer starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Crash X server
-#?*XSERVER-50 CRASH
+#?*XSERVER-0 CRASH
 
 # User session is terminated
-#?SESSION-X-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index afa5004c2b265de0e6f4bfac6eefc9ee849fcf34..4b2aefbc63e6dae52081561ed47ec358c2808460 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -2,40 +2,37 @@
 # Check can login
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf
index b93f6678a158133c9607e2ff1d47eee0e490fb7b..f6653f5c7c1a708e9a631a8bc0c3d199fceb2a1b 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -5,28 +5,25 @@
 [test-runner-config]
 disable-accounts-service=true
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf
index 91a5b8a65bca62fdea82010d6c1385d78e5f9c8e..07d80c775818cdbd8a9284afa86def816f7b7187 100644 (file)
--- a/tests/scripts/no-console-kit-or-login1.conf
+++ b/tests/scripts/no-console-kit-or-login1.conf
@@ -6,28 +6,25 @@
 disable-console-kit=true
 disable-login1=true
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index 4b56d47fc2f2350473485bf533d349d1625636dc..8ce8c5a20fccdc6044d2e1857156c1eb4f6aaf33 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -5,28 +5,25 @@
 [test-runner-config]
 disable-console-kit=true
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf
index a19edc259caa018453d318c3fd80fbf088b64853..d6a871f88fcbee2d86bc2f641ee15dc01fc38d5f 100644 (file)
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -2,31 +2,28 @@
 # Check handles user that has no keyboard layout
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Correct layout is found
-#?*GREETER-X-50 LOG-LAYOUT USERNAME=have-password1
-#?GREETER-X-50 LOG-LAYOUT USERNAME=have-password1 LAYOUT=''
+#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-password1
+#?GREETER-X-0 LOG-LAYOUT USERNAME=have-password1 LAYOUT=''
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf
index 09e94a79b4e8b384cb9a6fc881a21f679a4733df..492922e71e736bd9bb84deeaf9b7063e166c71f3 100644 (file)
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -2,31 +2,28 @@
 # Check handles user that has no language set
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Correct layout is found
-#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-password1
-#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE=
+#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-password1
+#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE=
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf
index cf3f71a9848b4bc616944da4f51e85a735594797..e908c817d4b8c343a9f9c042d1de7415146f473a 100644 (file)
--- a/tests/scripts/no-login1.conf
+++ b/tests/scripts/no-login1.conf
@@ -5,28 +5,25 @@
 [test-runner-config]
 disable-login1=true
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf
index 083c11d0adb4dea46a07fbcb1d9af384037a6a79..cee5ee93a926c98d0a1570d0757a47d34902fc19 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -3,44 +3,41 @@
 # Use a greeter so its file descriptors are around at the time the session starts.
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check file descriptors
-#?*SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS
-#?SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
+#?*SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS
+#?SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 173fed620b04544155bac8721294f9dc72ab9e5e..35655ef3a62c2fa03d5dd9d0a8e112a8fce9f5bc 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -2,28 +2,25 @@
 # Check we handle conversations during each PAM method
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=log-pam
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=log-pam
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=log-pam
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
index be2fd941e5422bd5839bddb385eb44e401a4fa38..905b3d200eb8248b4d4f4a743831874f3429733c 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -2,9 +2,6 @@
 # Check Plymouth quits when X server is started.  Plymouth is on an active VT so it handshakes with the X server.
 #
 
-[LightDM]
-minimum-display-number=50
-
 [test-plymouth-config]
 enabled=true
 has-active-vt=true
@@ -18,24 +15,24 @@ active=true
 #?PLYMOUTH DEACTIVATE
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # Plymouth quits but keeps image in framebuffer
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index 99ec3bab271869d618a2fb99b2fb4891015174f9..017cdcce977a5a0db0dd770f98725a5a100e89e6 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -2,9 +2,6 @@
 # Check Plymouth quits when X server is started.  Plymouth is on an inactive VT so it quits immediately.
 #
 
-[LightDM]
-minimum-display-number=50
-
 [test-plymouth-config]
 enabled=true
 active=true
@@ -15,21 +12,21 @@ active=true
 #?PLYMOUTH PING ACTIVE=TRUE
 #?PLYMOUTH HAS-ACTIVE-VT=FALSE
 #?PLYMOUTH QUIT RETAIN-SPLASH=FALSE
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/plymouth-no-seat.conf b/tests/scripts/plymouth-no-seat.conf
index 3cd081f3e6e1f26509c6d2f77de03bbc59fe5793..5e5d5d258a914d3f847ad1b9613e0e3b917312b9 100644 (file)
--- a/tests/scripts/plymouth-no-seat.conf
+++ b/tests/scripts/plymouth-no-seat.conf
@@ -4,7 +4,6 @@
 
 [LightDM]
 start-default-seat=false
-minimum-display-number=50
 
 [test-plymouth-config]
 enabled=true

diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index 5355703f8aa171ccc4e52a71ab181c64c5c80a69..e08f7074f7e547bd898f69b1b39fd1acd59e1982 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -5,63 +5,60 @@
 [test-runner-config]
 disable-console-kit=true
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # See if can suspend
-#?*GREETER-X-50 GET-CAN-SUSPEND
+#?*GREETER-X-0 GET-CAN-SUSPEND
 #?LOGIN1 CAN-SUSPEND
-#?GREETER-X-50 CAN-SUSPEND ALLOWED=TRUE
+#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE
 
 # Suspend
-#?*GREETER-X-50 SUSPEND
+#?*GREETER-X-0 SUSPEND
 #?LOGIN1 SUSPEND
 
 # See if can hibernate
-#?*GREETER-X-50 GET-CAN-HIBERNATE
+#?*GREETER-X-0 GET-CAN-HIBERNATE
 #?LOGIN1 CAN-HIBERNATE
-#?GREETER-X-50 CAN-HIBERNATE ALLOWED=TRUE
+#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE
 
 # Hibernate
-#?*GREETER-X-50 HIBERNATE
+#?*GREETER-X-0 HIBERNATE
 #?LOGIN1 HIBERNATE
 
 # See if can restart
-#?*GREETER-X-50 GET-CAN-RESTART
+#?*GREETER-X-0 GET-CAN-RESTART
 #?LOGIN1 CAN-REBOOT
-#?GREETER-X-50 CAN-RESTART ALLOWED=TRUE
+#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE
 
 # Restart
-#?*GREETER-X-50 RESTART
+#?*GREETER-X-0 RESTART
 #?LOGIN1 REBOOT
 
 # See if can shutdown
-#?*GREETER-X-50 GET-CAN-SHUTDOWN
+#?*GREETER-X-0 GET-CAN-SHUTDOWN
 #?LOGIN1 CAN-POWER-OFF
-#?GREETER-X-50 CAN-SHUTDOWN ALLOWED=TRUE
+#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE
 
 # Shutdown
-#?*GREETER-X-50 SHUTDOWN
+#?*GREETER-X-0 SHUTDOWN
 #?LOGIN1 POWER-OFF
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf
index e020dc973783c95edaf5f33c2354a8cf6e7229cd..ed996d3c0c56e5d05d945c190de718712e347aac 100644 (file)
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -5,63 +5,60 @@
 [test-runner-config]
 disable-login1=true
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # See if can suspend
-#?*GREETER-X-50 GET-CAN-SUSPEND
+#?*GREETER-X-0 GET-CAN-SUSPEND
 #?UPOWER SUSPEND-ALLOWED
-#?GREETER-X-50 CAN-SUSPEND ALLOWED=TRUE
+#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE
 
 # Suspend
-#?*GREETER-X-50 SUSPEND
+#?*GREETER-X-0 SUSPEND
 #?UPOWER SUSPEND
 
 # See if can hibernate
-#?*GREETER-X-50 GET-CAN-HIBERNATE
+#?*GREETER-X-0 GET-CAN-HIBERNATE
 #?UPOWER HIBERNATE-ALLOWED
-#?GREETER-X-50 CAN-HIBERNATE ALLOWED=TRUE
+#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE
 
 # Hibernate
-#?*GREETER-X-50 HIBERNATE
+#?*GREETER-X-0 HIBERNATE
 #?UPOWER HIBERNATE
 
 # See if can restart
-#?*GREETER-X-50 GET-CAN-RESTART
+#?*GREETER-X-0 GET-CAN-RESTART
 #?CONSOLE-KIT CAN-RESTART
-#?GREETER-X-50 CAN-RESTART ALLOWED=TRUE
+#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE
 
 # Restart
-#?*GREETER-X-50 RESTART
+#?*GREETER-X-0 RESTART
 #?CONSOLE-KIT RESTART
 
 # See if can shutdown
-#?*GREETER-X-50 GET-CAN-SHUTDOWN
+#?*GREETER-X-0 GET-CAN-SHUTDOWN
 #?CONSOLE-KIT CAN-STOP
-#?GREETER-X-50 CAN-SHUTDOWN ALLOWED=TRUE
+#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE
 
 # Shutdown
-#?*GREETER-X-50 SHUTDOWN
+#?*GREETER-X-0 SHUTDOWN
 #?CONSOLE-KIT STOP
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf
index 5147db0f502939e5df4b07086af32f7a360245e5..613f2a3e3a6f132e599cbeae477fa105dc685840 100644 (file)
--- a/tests/scripts/power-no-services.conf
+++ b/tests/scripts/power-no-services.conf
@@ -7,59 +7,56 @@ disable-upower=true
 disable-console-kit=true
 disable-login1=true
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # See if can suspend
-#?*GREETER-X-50 GET-CAN-SUSPEND
-#?GREETER-X-50 CAN-SUSPEND ALLOWED=FALSE
+#?*GREETER-X-0 GET-CAN-SUSPEND
+#?GREETER-X-0 CAN-SUSPEND ALLOWED=FALSE
 
 # Suspend
-#?*GREETER-X-50 SUSPEND
-#?GREETER-X-50 FAIL-SUSPEND
+#?*GREETER-X-0 SUSPEND
+#?GREETER-X-0 FAIL-SUSPEND
 
 # See if can hibernate
-#?*GREETER-X-50 GET-CAN-HIBERNATE
-#?GREETER-X-50 CAN-HIBERNATE ALLOWED=FALSE
+#?*GREETER-X-0 GET-CAN-HIBERNATE
+#?GREETER-X-0 CAN-HIBERNATE ALLOWED=FALSE
 
 # Hibernate
-#?*GREETER-X-50 HIBERNATE
-#?GREETER-X-50 FAIL-HIBERNATE
+#?*GREETER-X-0 HIBERNATE
+#?GREETER-X-0 FAIL-HIBERNATE
 
 # See if can restart
-#?*GREETER-X-50 GET-CAN-RESTART
-#?GREETER-X-50 CAN-RESTART ALLOWED=FALSE
+#?*GREETER-X-0 GET-CAN-RESTART
+#?GREETER-X-0 CAN-RESTART ALLOWED=FALSE
 
 # Restart
-#?*GREETER-X-50 RESTART
-#?GREETER-X-50 FAIL-RESTART
+#?*GREETER-X-0 RESTART
+#?GREETER-X-0 FAIL-RESTART
 
 # See if can shutdown
-#?*GREETER-X-50 GET-CAN-SHUTDOWN
-#?GREETER-X-50 CAN-SHUTDOWN ALLOWED=FALSE
+#?*GREETER-X-0 GET-CAN-SHUTDOWN
+#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=FALSE
 
 # Shutdown
-#?*GREETER-X-50 SHUTDOWN
-#?GREETER-X-50 FAIL-SHUTDOWN
+#?*GREETER-X-0 SHUTDOWN
+#?GREETER-X-0 FAIL-SHUTDOWN
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
index b5c23e96d2a43e6cfa1e544939ad01ca62876494..d909884d205736f483e7a7cc07fb5afbada36986 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -2,63 +2,60 @@
 # Check can do power operations from the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # See if can suspend
-#?*GREETER-X-50 GET-CAN-SUSPEND
+#?*GREETER-X-0 GET-CAN-SUSPEND
 #?LOGIN1 CAN-SUSPEND
-#?GREETER-X-50 CAN-SUSPEND ALLOWED=TRUE
+#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE
 
 # Suspend
-#?*GREETER-X-50 SUSPEND
+#?*GREETER-X-0 SUSPEND
 #?LOGIN1 SUSPEND
 
 # See if can hibernate
-#?*GREETER-X-50 GET-CAN-HIBERNATE
+#?*GREETER-X-0 GET-CAN-HIBERNATE
 #?LOGIN1 CAN-HIBERNATE
-#?GREETER-X-50 CAN-HIBERNATE ALLOWED=TRUE
+#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE
 
 # Hibernate
-#?*GREETER-X-50 HIBERNATE
+#?*GREETER-X-0 HIBERNATE
 #?LOGIN1 HIBERNATE
 
 # See if can restart
-#?*GREETER-X-50 GET-CAN-RESTART
+#?*GREETER-X-0 GET-CAN-RESTART
 #?LOGIN1 CAN-REBOOT
-#?GREETER-X-50 CAN-RESTART ALLOWED=TRUE
+#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE
 
 # Restart
-#?*GREETER-X-50 RESTART
+#?*GREETER-X-0 RESTART
 #?LOGIN1 REBOOT
 
 # See if can shutdown
-#?*GREETER-X-50 GET-CAN-SHUTDOWN
+#?*GREETER-X-0 GET-CAN-SHUTDOWN
 #?LOGIN1 CAN-POWER-OFF
-#?GREETER-X-50 CAN-SHUTDOWN ALLOWED=TRUE
+#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE
 
 # Shutdown
-#?*GREETER-X-50 SHUTDOWN
+#?*GREETER-X-0 SHUTDOWN
 #?LOGIN1 POWER-OFF
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index 01a911d31f8ecad03dd23ef2b6aaf1cb6a003119..a7b71164eed8c538bf20792474cf9c1f1c7d3f16 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -2,36 +2,33 @@
 # Check can restart authentication
 #
 
-[LightDM]
-minimum-display-number=50
-
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Start authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Restart authentication
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf
index 07e7a539b5f06e71dce4eb8a593b5cfde94605ad..1b3012c9502ae9d5d1641d845871d28e7fb50e02 100644 (file)
--- a/tests/scripts/script-hook-fail-display-setup.conf
+++ b/tests/scripts/script-hook-fail-display-setup.conf
@@ -2,25 +2,22 @@
 # Check LightDM stops the display if the display setup script returns an error
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 display-setup-script=test-script-hook DISPLAY-SETUP 1
 
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK DISPLAY-SETUP
 
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf
index 08db58772c8a64ab8a494c8340098ccff977bbad..464875e07bbc723beadd6f91796adfb541486cbc 100644 (file)
--- a/tests/scripts/script-hook-fail-greeter-setup.conf
+++ b/tests/scripts/script-hook-fail-greeter-setup.conf
@@ -2,25 +2,22 @@
 # Check LightDM stops the display if the display setup script returns an error
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 greeter-setup-script=test-script-hook GREETER-SETUP 1
 
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK GREETER-SETUP
 
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
index b306d5f3656ad6518a36f8b6623bd9be5404c0fa..81519cacb20629a541985caaf1b92944bcb3cfc0 100644 (file)
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -2,9 +2,6 @@
 # Check LightDM stops returns to the greeter if the session setup script fails
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 session-setup-script=test-script-hook SESSION-SETUP 1
 autologin-user=have-password1
@@ -12,24 +9,24 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index d505e19f4eefcba45213ca47df42b62aef36a2e0..984ef3aa2d2f1bd14b9d8c1ba66dfdd410932f24 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -2,9 +2,6 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 display-setup-script=test-script-hook DISPLAY-SETUP
 greeter-setup-script=test-script-hook GREETER-SETUP
@@ -15,50 +12,50 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION-X-50 LOGOUT
+#?*SESSION-X-0 LOGOUT
 
 # Script hook runs
 #?SCRIPT-HOOK SESSION-CLEANUP
 
 # X server stops
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK GREETER-SETUP
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index 08ee967658f768c6f4312e5e328e2bc4d10c007e..c0690774e07b71bcd6050e541c1b0c72624ab71b 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -2,89 +2,86 @@
 # Check session log is backed up and restart on second login
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=no-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION-X-50 WRITE-STDERR TEXT=FIRST-SESSION
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=FIRST-SESSION
+#?*SESSION-X-0 WRITE-STDERR TEXT=FIRST-SESSION
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=FIRST-SESSION
 
 # Restart session
-#?*SESSION-X-50 LOGOUT
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
-#?*GREETER-X-50 AUTHENTICATE USERNAME=no-password1
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?*SESSION-X-0 LOGOUT
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION-X-50 WRITE-STDERR TEXT=SECOND-SESSION
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=SECOND-SESSION
+#?*SESSION-X-0 WRITE-STDERR TEXT=SECOND-SESSION
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=SECOND-SESSION
 
 # Check first log is backed up
-#?*SESSION-X-50 READ FILE=.xsession-errors.old
-#?SESSION-X-50 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION
+#?*SESSION-X-0 READ FILE=.xsession-errors.old
+#?SESSION-X-0 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION
 
 # Restart session
-#?*SESSION-X-50 LOGOUT
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
-#?*GREETER-X-50 AUTHENTICATE USERNAME=no-password1
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?*SESSION-X-0 LOGOUT
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION-X-50 WRITE-STDERR TEXT=THIRD-SESSION
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=THIRD-SESSION
+#?*SESSION-X-0 WRITE-STDERR TEXT=THIRD-SESSION
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=THIRD-SESSION
 
 # Check second log is backed up
-#?*SESSION-X-50 READ FILE=.xsession-errors.old
-#?SESSION-X-50 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION
+#?*SESSION-X-0 READ FILE=.xsession-errors.old
+#?SESSION-X-0 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf
index eb50c888da8f34bc65cf05c79cc5aafef6fce033..4b26e161e7e928a6227f072fbcfd7de8678bd457 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -2,34 +2,31 @@
 # Check session stderr is written to ~/.xsession-errors and multiple writes are appended
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stderr and check all text ends up in log
-#?*SESSION-X-50 WRITE-STDERR TEXT=MULTI-
-#?*SESSION-X-50 WRITE-STDERR TEXT=WRITE
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=MULTI-WRITE
+#?*SESSION-X-0 WRITE-STDERR TEXT=MULTI-
+#?*SESSION-X-0 WRITE-STDERR TEXT=WRITE
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=MULTI-WRITE
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf
index 9c14e0edda117bed65d83284531d64284a30c894..fddea59e28ea541af44ea87828988edbb5db98a2 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -2,33 +2,30 @@
 # Check session stderr is written to ~/.xsession-errors
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION-X-50 WRITE-STDERR TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
+#?*SESSION-X-0 WRITE-STDERR TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf
index 687d5102678e748a06304a31508bbf80c326bb8a..bf3dc97bdeff82558645230fe9a321c30a86b0e7 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -2,33 +2,30 @@
 # Check session stdout is not written anywhere
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Write to stdout and check it doesn't end up in the session error log (you should also manually check when running the test if it is printed)
-#?*SESSION-X-50 WRITE-STDOUT TEXT=YOU-SHOULD-NOT-SEE-THIS
-#?*SESSION-X-50 READ FILE=.xsession-errors
-#?SESSION-X-50 READ FILE=.xsession-errors TEXT=
+#?*SESSION-X-0 WRITE-STDOUT TEXT=YOU-SHOULD-NOT-SEE-THIS
+#?*SESSION-X-0 READ FILE=.xsession-errors
+#?SESSION-X-0 READ FILE=.xsession-errors TEXT=
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

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 17509405fde9e54232311c4e293c05a662f66b76..ed59e728343fbc088c2d7af7910a7f2111e18ccb 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf
+++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf
@@ -2,75 +2,72 @@
 # Use D-Bus interface to show the greeter, then start a new session and log out of it
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password2
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
-#?GREETER-X-51 TERMINATE SIGNAL=15
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-51 START USER=have-password2
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=have-password2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Logout of new session
-#?*SESSION-X-51 LOGOUT
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?*SESSION-X-1 LOGOUT
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

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 5e210ec7bc1da1ef4198ab04968cb2b5c75175fe..2fe64f7541b825f8dd2615f7a84bebb1b56403db 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf
+++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf
@@ -2,79 +2,76 @@
 # Use D-Bus interface to show the greeter, then start a new session, switch to the old one and log out
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password2
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
-#?GREETER-X-51 TERMINATE SIGNAL=15
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-51 START USER=have-password2
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=have-password2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to old session
 #?*SWITCH-TO-USER USERNAME=have-password1
 #?RUNNER SWITCH-TO-USER USERNAME=have-password1
 
 # Logout of old session
-#?*SESSION-X-50 LOGOUT
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?*SESSION-X-0 LOGOUT
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index 206f95debbf52c8996bd9ca0f964d1e019bc6576..83ced4d09ce56b04719c221d58fc73027830bd16 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -2,61 +2,58 @@
 # Use D-Bus interface to show the greeter, then start a new session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password2
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
-#?GREETER-X-51 TERMINATE SIGNAL=15
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+#?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-51 START USER=have-password2
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=have-password2
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
index bd61e4a6e713ed64fb65931bd84d482e73316ec9..bb62c6f01860a30564c5f5e7519a9620d17879ad 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -2,73 +2,70 @@
 # Use D-Bus interface to show the greeter, then return to the same session, then logout
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Login as existing user
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
 
 # Greeter and X server stop
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # Logout session
-#?*SESSION-X-50 LOGOUT
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?*SESSION-X-0 LOGOUT
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
index 77dbb684f4d7c3115639e99636a79d5fd941c221..9c4fdee7603f1001dbc282de5ae42742a7ae5a92 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -2,57 +2,54 @@
 # Use D-Bus interface to show the greeter, then return to the same session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Login as existing user
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-51 RESPOND TEXT="password"
-#?GREETER-X-51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-51 START-SESSION
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
 
 # Greeter and X server stop
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index 48cd27dbc1064fdd654429dcf1caeb78ba9a48e2..4ae3e11f9ba024378125a0648d36ae997e0e2b3e 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -2,48 +2,45 @@
 # Use D-Bus interface to show the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index f5bc4fa3e8553083b9d6eee0ada7e4f89df90d9c..4a3a899c98a8a8ce11db77a83f1618836d3165f5 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -2,9 +2,6 @@
 # Check D-Bus interface can trigger/switch to guest session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
@@ -12,35 +9,35 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Default session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to guest
 #?*SWITCH-TO-GUEST
 #?RUNNER SWITCH-TO-GUEST
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-51 START USER=guest-.*
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=guest-.*
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Switch again, should not do anything as guest already running
 #?*SWITCH-TO-GUEST
@@ -49,9 +46,9 @@ autologin-user=have-password1
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf
index 5a92595b989428fbe51eac30681697f80ce86696..001bb7d7232be592d1b194dd67f8981bb6574b5a 100644 (file)
--- a/tests/scripts/switch-to-user-existing-session.conf
+++ b/tests/scripts/switch-to-user-existing-session.conf
@@ -2,9 +2,6 @@
 # Check that switching to an existing user does nothing
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
@@ -12,16 +9,16 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to account with a password
 #?*SWITCH-TO-USER USERNAME=have-password1
@@ -32,6 +29,6 @@ autologin-user=have-password1
 
 # Cleanup
 #?*STOP-DAEMON
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf
index 661accc662b63d3734866a17e06c131c612795db..0670ce14363185127093e2cdafd38838e07c90c6 100644 (file)
--- a/tests/scripts/switch-to-user-logout.conf
+++ b/tests/scripts/switch-to-user-logout.conf
@@ -2,9 +2,6 @@
 # Check that logging out from a switched user returns to the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
@@ -12,57 +9,57 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to an account without a password
 #?*SWITCH-TO-USER USERNAME=no-password1
 #?RUNNER SWITCH-TO-USER USERNAME=no-password1
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION-X-51 START USER=no-password1
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=no-password1
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION-X-51 LOGOUT
+#?*SESSION-X-1 LOGOUT
 
 # X server stops
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts for greeter
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf
index 8f97b0dba2531c1ee8db338dddf51c5b39f804a4..47cc3ebcab61a1334701e884a66f661880a8e937 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -2,9 +2,6 @@
 # Check that switching to a user without a password doesn't show a greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
@@ -12,37 +9,37 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to account without a password
 #?*SWITCH-TO-USER USERNAME=no-password1
 #?RUNNER SWITCH-TO-USER USERNAME=no-password1
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION-X-51 START USER=no-password1
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=no-password1
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index b120bb5870da1168306a08ca7a68a67dda78d64f..e221bc6066c3cef8cd8b86b0599d78f014dfcbec 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -2,9 +2,6 @@
 # Check that switching to a user shows the greeter
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=no-password1
 
@@ -12,44 +9,44 @@ autologin-user=no-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=no-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to an account with a password
 #?*SWITCH-TO-USER USERNAME=have-password1
 #?RUNNER SWITCH-TO-USER USERNAME=have-password1
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-51 START
-#?XSERVER-51 ACCEPT-CONNECT
-#?GREETER-X-51 CONNECT-XSERVER
-#?GREETER-X-51 CONNECT-TO-DAEMON
-#?GREETER-X-51 CONNECTED-TO-DAEMON
+#?GREETER-X-1 START
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # Requested user is automatically selected
-#?GREETER-X-51 SELECT-USER-HINT USERNAME=have-password1
-#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
+#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?GREETER-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf
index 922f562928387cf5ab5e49c139da43a5e47c08b2..efe23de6a64d9b2a44a403d50ff1e1852a7178d5 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -2,9 +2,6 @@
 # Check that switching to multiple users works
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
@@ -12,55 +9,55 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Switch to account without a password
 #?*SWITCH-TO-USER USERNAME=no-password1
 #?RUNNER SWITCH-TO-USER USERNAME=no-password1
 
 # New X server starts
-#?XSERVER-51 START
-#?XSERVER-51 INDICATE-READY
+#?XSERVER-1 START
+#?XSERVER-1 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-51 ACCEPT-CONNECT
+#?XSERVER-1 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION-X-51 START USER=no-password1
-#?XSERVER-51 ACCEPT-CONNECT
-#?SESSION-X-51 CONNECT-XSERVER
+#?SESSION-X-1 START USER=no-password1
+#?XSERVER-1 ACCEPT-CONNECT
+#?SESSION-X-1 CONNECT-XSERVER
 
 # Switch to another account without a password
 #?*SWITCH-TO-USER USERNAME=no-password2
 #?RUNNER SWITCH-TO-USER USERNAME=no-password2
 
 # New X server starts
-#?XSERVER-52 START
-#?XSERVER-52 INDICATE-READY
+#?XSERVER-2 START
+#?XSERVER-2 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-52 ACCEPT-CONNECT
+#?XSERVER-2 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION-X-52 START USER=no-password2
-#?XSERVER-52 ACCEPT-CONNECT
-#?SESSION-X-52 CONNECT-XSERVER
+#?SESSION-X-2 START USER=no-password2
+#?XSERVER-2 ACCEPT-CONNECT
+#?SESSION-X-2 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
-#?SESSION-X-51 TERMINATE SIGNAL=15
-#?XSERVER-51 TERMINATE SIGNAL=15
-#?SESSION-X-52 TERMINATE SIGNAL=15
-#?XSERVER-52 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?SESSION-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?SESSION-X-2 TERMINATE SIGNAL=15
+#?XSERVER-2 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index bcc2735e246244bd0bc970d193781ad53f62fa21..0e196089e02d64fc31993931d2b8f82207a5f1cd 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -3,7 +3,6 @@
 #
 
 [LightDM]
-minimum-display-number=50
 user-authority-in-system-dir=true
 
 [SeatDefaults]
@@ -12,23 +11,23 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check where the X authority is
-#?*SESSION-X-50 READ-ENV NAME=XAUTHORITY
-#?SESSION-X-50 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority
+#?*SESSION-X-0 READ-ENV NAME=XAUTHORITY
+#?SESSION-X-0 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index 01b049ecbd8c29f93769e8ec433289a17fbf5f9d..1d91310661e5415f00d7af920931515ab9cb2d35 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -2,32 +2,29 @@
 # Check if PAM renames the user to one that doesn't exist lightdm handles this
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=change-user-invalid
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)
 
 # Greeter starts
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?GREETER-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index eff630f7d7b4d539b99b98e65234e7ec71782b39..84ee35740a11e3e85ab17884c7db85cc83ab3f0e 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -2,28 +2,25 @@
 # Check if PAM renames the user then lightdm detects this and uses the new user account
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=change-user1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=change-user2
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=change-user2
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf
index 07afbe214f44d5d1b0da620e912b92e3cfbf9419..0b195a30d349fdf3a7a3c050aeadc374f65b21a5 100644 (file)
--- a/tests/scripts/util-path.conf
+++ b/tests/scripts/util-path.conf
@@ -2,33 +2,30 @@
 # Check utility path is set in session
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check utility path is there
-#?*SESSION-X-50 READ-ENV NAME=PATH
+#?*SESSION-X-0 READ-ENV NAME=PATH
 # FIXME: This is a really crap regex and the path could be overridden in the configure stage
-#?SESSION-X-50 READ-ENV NAME=PATH VALUE=.*/lightdm:.*
+#?SESSION-X-0 READ-ENV NAME=PATH VALUE=.*/lightdm:.*
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
index 4c27d5cb7b19ada54812d19f109391d36dc70cd0..5586ac6bb7009bc21302a2c0ce7efc52ec0e5f91 100644 (file)
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -3,7 +3,6 @@
 #
 
 [LightDM]
-minimum-display-number=50
 start-default-seat=false
 
 [VNCServer]
@@ -20,9 +19,23 @@ command=Xvnc -option
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER-50 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE
+#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE
+
+# Negotiate with Xvnc
+#?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
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Clean up
 #?*STOP-DAEMON
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf
index b2ff7e08c1a1bc52c1911eee6ffc39e50392688d..93b16f0d2cb45f7554e922d3994c711312908180 100644 (file)
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -3,7 +3,6 @@
 #
 
 [LightDM]
-minimum-display-number=50
 start-default-seat=false
 
 [VNCServer]
@@ -22,9 +21,23 @@ depth=16
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER-50 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE
+#?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE
+
+# Negotiate with Xvnc
+#?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
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Clean up
 #?*STOP-DAEMON
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index de689d5a5edba8c7f9bb469c14a02d4820c6650f..f62e0a80b2c4d7a3cf03a0323bd2157de7b975ef 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -3,7 +3,6 @@
 #
 
 [LightDM]
-minimum-display-number=50
 start-default-seat=false
 
 [VNCServer]
@@ -19,39 +18,39 @@ port=9999
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER-50 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
+#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
 
 # Negotiate with Xvnc
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 
 # LightDM and vnc-client connect to X server
-#?XSERVER-50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf
index c6a4238b447cc1483eeccfb9eb5fb9d48d3fd094..b77bdb81f3f89a002e4488b2c67d65fbc13ac2ce 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -3,7 +3,6 @@
 #
 
 [LightDM]
-minimum-display-number=50
 start-default-seat=false
 
 [VNCServer]
@@ -19,44 +18,44 @@ port=9999
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER-50 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
+#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
 
 # Negotiate with Xvnc
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
 
-#?XSERVER-50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
+#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-50 START
-#?XSERVER-50 ACCEPT-CONNECT
-#?GREETER-X-50 CONNECT-XSERVER
-#?GREETER-X-50 CONNECT-TO-DAEMON
-#?GREETER-X-50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-50 RESPOND TEXT="password"
-#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-50 START-SESSION
-#?GREETER-X-50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check file descriptors
-#?*SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS
-#?SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
+#?*SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS
+#?SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
 
 # Clean up
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index 8507cffb34030eb8c97ebc3046052e17b6cfc93d..790cde14d176eedfbde7be251106c4d249bfbfd3 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -2,32 +2,29 @@
 # Check X authority written into home directory
 #
 
-[LightDM]
-minimum-display-number=50
-
 [SeatDefaults]
 autologin-user=have-password1
 
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER-50 START
-#?XSERVER-50 INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER-50 ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-50 START USER=have-password1
-#?XSERVER-50 ACCEPT-CONNECT
-#?SESSION-X-50 CONNECT-XSERVER
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Check where the X authority is
-#?*SESSION-X-50 READ-ENV NAME=XAUTHORITY
-#?SESSION-X-50 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority
+#?*SESSION-X-0 READ-ENV NAME=XAUTHORITY
+#?SESSION-X-0 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-X-50 TERMINATE SIGNAL=15
-#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf
index 3ae88bc693e19527f7f6bc7cd195070454ce1de3..13f6d621a097f876658628974dd5a961d0812dcb 100644 (file)
--- a/tests/scripts/xdmcp-login.conf
+++ b/tests/scripts/xdmcp-login.conf
@@ -4,7 +4,6 @@
 
 [LightDM]
 start-default-seat=false
-minimum-display-number=50
 
 [XDMCPServer]
 enabled=true
@@ -25,11 +24,11 @@ port=9999
 #?XSERVER-98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS"
 
 # LightDM connects to X server
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?XSERVER-98 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-127.0.0.1:98 START
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?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
@@ -44,7 +43,7 @@ port=9999
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START USER=have-password1
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?XSERVER-98 ACCEPT-CONNECT
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Clean up

diff --git a/tests/scripts/xdmcp-open-file-descriptors.conf b/tests/scripts/xdmcp-open-file-descriptors.conf
index 06da246e26d4682b4475021249e27b4f8b05fe6e..78073936260668bf4a2108f7e02292c332ff009e 100644 (file)
--- a/tests/scripts/xdmcp-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-open-file-descriptors.conf
@@ -4,7 +4,6 @@
 
 [LightDM]
 start-default-seat=false
-minimum-display-number=50
 
 [XDMCPServer]
 enabled=true
@@ -25,11 +24,11 @@ port=9999
 #?XSERVER-98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS"
 
 # LightDM connects to X server
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?XSERVER-98 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
 #?GREETER-X-127.0.0.1:98 START
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?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
@@ -44,7 +43,7 @@ port=9999
 
 # Session starts
 #?SESSION-X-127.0.0.1:98 START USER=have-password1
-#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?XSERVER-98 ACCEPT-CONNECT
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Check file descriptors

diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf
index 0e7fe044606010e035a4446a9d17e24374af8d7e..1ea8ea428f37f1c29eb490007fade28796ddc400 100644 (file)
--- a/tests/scripts/xserver-fail-start.conf
+++ b/tests/scripts/xserver-fail-start.conf
@@ -1,8 +1,6 @@
 #
 # Check that LightDM handles an X server that fails to start.
 #
-[LightDM]
-minimum-display-number=50
 
 [test-xserver-config]
 return-value=1
@@ -10,8 +8,8 @@ return-value=1
 #?RUNNER DAEMON-START
 
 # X server fails to start
-#?XSERVER-50 START
-#?XSERVER-50 EXIT CODE=1
+#?XSERVER-0 START
+#?XSERVER-0 EXIT CODE=1
 
 # Daemon stops with error
 #?RUNNER DAEMON-EXIT STATUS=1

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 6dbbff1067149973f5b6be4236ebf9a2c185b40c..586059b2fb9668a9649ce1aaf8132c730f673498 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -5,10 +5,11 @@ noinst_LTLIBRARIES = libsystem.la
 libsystem_la_SOURCES = libsystem.c
 libsystem_la_CFLAGS = \
        $(GLIB_CFLAGS) \
+       $(GIO_UNIX_CFLAGS) \
        -DSRCDIR=\"$(abs_top_srcdir)\" \
        -DBUILDDIR=\"$(abs_top_builddir)\" \
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\"
-libsystem_la_LIBADD = -ldl $(GLIB_LIBS)
+libsystem_la_LIBADD = -ldl $(GLIB_LIBS) $(GIO_UNIX_LIBS)
 
 # This is required to have autotools generate a library that is not installed
 # but produces a shared library (instead of just a static library)

diff --git a/tests/src/X.c b/tests/src/X.c
index 1fd3e57787034b268c7b4b9ab68a19d0e18dbcbe..86ae768df1c227dd93393406b5c09b008b265a92 100644 (file)
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -146,66 +146,11 @@ xdmcp_failed_cb (XDMCPClient *client, XDMCPFailed *message)
 }
 
 static void
-x_client_connect_cb (XClient *client, XConnect *message)
+client_connected_cb (XServer *server, XClient *client)
 {
     gchar *auth_error = NULL;
 
-    if (x_client_get_address (client))
-        status_notify ("XSERVER-%d TCP-ACCEPT-CONNECT", display_number);
-    else
-        status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
-
-    if (xdmcp_client)
-    {
-        if (!xdmcp_cookie)
-            auth_error = g_strdup ("Need to authenticate with XDMCP");
-        else
-        {
-            gboolean matches = TRUE;
-            if (message->authorization_protocol_data_length == xdmcp_cookie_length)
-            {
-                guint16 i;
-                for (i = 0; i < xdmcp_cookie_length && message->authorization_protocol_data[i] == xdmcp_cookie[i]; i++);
-                matches = i == xdmcp_cookie_length;
-            }
-            else
-                matches = FALSE;
-
-            if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") != 0)
-                auth_error = g_strdup ("Authorization required");
-            else if (!matches)
-                auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key");
-        }
-    }
-    else if (auth_path)
-    {
-        XAuthority *authority;
-        XAuthorityRecord *record = NULL;
-        GError *error = NULL;
-
-        authority = x_authority_new ();
-        x_authority_load (authority, auth_path, &error);
-        if (error)
-            g_warning ("Error reading auth file: %s", error->message);
-        g_clear_error (&error);
-
-        if (x_client_get_address (client))
-            record = x_authority_match_localhost (authority, message->authorization_protocol_name); // FIXME: Should check if remote
-        else
-            record = x_authority_match_local (authority, message->authorization_protocol_name);
-        if (record)
-        {
-            if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") == 0)
-            {
-                if (!x_authority_record_check_cookie (record, message->authorization_protocol_data, message->authorization_protocol_data_length))
-                    auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key");
-            }
-            else
-                auth_error = g_strdup_printf ("Unknown authorization: '%s'", message->authorization_protocol_name);
-        }
-        else
-            auth_error = g_strdup ("No authorization record");
-    }
+    status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
 
     if (auth_error)
         x_client_send_failed (client, auth_error);
@@ -214,12 +159,6 @@ x_client_connect_cb (XClient *client, XConnect *message)
     g_free (auth_error);
 }
 
-static void
-client_connected_cb (XServer *server, XClient *client)
-{
-    g_signal_connect (client, "connect", G_CALLBACK (x_client_connect_cb), NULL);
-}
-
 static void
 client_disconnected_cb (XServer *server, XClient *client)
 {  
@@ -346,11 +285,6 @@ main (int argc, char **argv)
     xserver = x_server_new (display_number);
     g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL);
     g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL);
-    x_server_set_listen_unix (xserver, listen_unix);
-    x_server_set_listen_tcp (xserver, listen_tcp);
-
-    /* Add fake screen so that libx11 calls don't freak out when they can't find a screen */
-    x_server_add_screen (xserver, 0xffffff, 0x000000, 0, 1024, 768, 1000, 1000);
 
     status_notify ("XSERVER-%d START", display_number);
 

diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c
index 5e7459478d34d229110ed3f6ccc3cf1a54845330..247c5c6eb1110f437ce16c108b02fec30010d550 100644 (file)
--- a/tests/src/Xvnc.c
+++ b/tests/src/Xvnc.c
@@ -73,44 +73,11 @@ signal_cb (int signum)
 }
 
 static void
-x_client_connect_cb (XClient *client, XConnect *message)
+client_connected_cb (XServer *server, XClient *client)
 {
     gchar *auth_error = NULL;
 
-    if (x_client_get_address (client))
-        status_notify ("XSERVER-%d TCP-ACCEPT-CONNECT", display_number);
-    else
-        status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
-
-    if (auth_path)
-    {
-        XAuthority *authority;
-        XAuthorityRecord *record = NULL;
-        GError *error = NULL;
-
-        authority = x_authority_new ();
-        x_authority_load (authority, auth_path, &error);
-        if (error)
-            g_warning ("Error reading auth file: %s", error->message);
-        g_clear_error (&error);
-
-        if (x_client_get_address (client))
-            record = x_authority_match_localhost (authority, message->authorization_protocol_name); // FIXME: Should check if remote
-        else
-            record = x_authority_match_local (authority, message->authorization_protocol_name);
-        if (record)
-        {
-            if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") == 0)
-            {
-                if (!x_authority_record_check_cookie (record, message->authorization_protocol_data, message->authorization_protocol_data_length))
-                    auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key");
-            }
-            else
-                auth_error = g_strdup_printf ("Unknown authorization: '%s'", message->authorization_protocol_name);
-        }
-        else
-            auth_error = g_strdup ("No authorization record");
-    }
+    status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
 
     if (auth_error)
         x_client_send_failed (client, auth_error);
@@ -119,12 +86,6 @@ x_client_connect_cb (XClient *client, XConnect *message)
     g_free (auth_error);
 }
 
-static void
-client_connected_cb (XServer *server, XClient *client)
-{
-    g_signal_connect (client, "connect", G_CALLBACK (x_client_connect_cb), NULL);
-}
-
 static void
 client_disconnected_cb (XServer *server, XClient *client)
 {  
@@ -177,6 +138,7 @@ main (int argc, char **argv)
     gboolean has_option = FALSE;
     gchar *geometry = g_strdup ("640x480");
     gint depth = 8;
+    gchar *lock_filename;
     int lock_file;
     int i;
 
@@ -250,8 +212,6 @@ main (int argc, char **argv)
     xserver = x_server_new (display_number);
     g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL);
     g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL);
-    x_server_set_listen_unix (xserver, listen_unix);
-    x_server_set_listen_tcp (xserver, listen_tcp);
 
     status_notify ("XSERVER-%d START GEOMETRY=%s DEPTH=%d OPTION=%s", display_number, geometry, depth, has_option ? "TRUE" : "FALSE");
 
@@ -272,7 +232,9 @@ main (int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    lock_path = g_strdup_printf ("/tmp/.X%d-lock", display_number);
+    lock_filename = g_strdup_printf (".X%d-lock", display_number);
+    lock_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", lock_filename, NULL);
+    g_free (lock_filename);
     lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444);
     if (lock_file < 0)
     {

diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index 4d960106d349c3106a4de986a56df6ed891021f6..77806edec5d23c5106547829194a85af8fe6c248 100644 (file)
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -14,6 +14,8 @@
 #include <linux/vt.h>
 #endif
 #include <glib.h>
+#include <xcb/xcb.h>
+#include <gio/gunixsocketaddress.h>
 
 #define LOGIN_PROMPT "login:"
 
@@ -1164,3 +1166,85 @@ void
 endutxent (void)
 {
 }
+
+struct xcb_connection_t
+{
+    gchar *display;
+    int error;
+    GSocket *socket;
+};
+
+xcb_connection_t *
+xcb_connect_to_display_with_auth_info (const char *display, xcb_auth_info_t *auth, int *screen)
+{
+    xcb_connection_t *c;
+    gchar *socket_path;
+    GSocketAddress *address;
+    GError *error = NULL;
+  
+    c = malloc (sizeof (xcb_connection_t));
+    c->display = g_strdup (display);
+    c->error = 0;
+
+    if (display == NULL)
+        display = getenv ("DISPLAY");
+    if (display == NULL)
+        c->error = XCB_CONN_CLOSED_PARSE_ERR;
+
+    if (c->error == 0)
+    {
+        c->socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error);
+        if (error)
+            g_printerr ("%s\n", error->message);
+        g_clear_error (&error);
+        if (c->socket == NULL)
+            c->error = XCB_CONN_ERROR;
+    }
+
+    if (c->error == 0)
+    {
+        const gchar *d;
+
+        /* Skip the hostname, we'll assume it's localhost */
+        d = strchr (display, ':');
+
+        socket_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", d, NULL);
+        address = g_unix_socket_address_new (socket_path);
+        g_free (socket_path);
+        if (!g_socket_connect (c->socket, address, NULL, &error))
+            c->error = XCB_CONN_ERROR;
+        if (error)
+            g_printerr ("%s\n", error->message);
+        g_clear_error (&error);
+    }
+
+    // FIXME: Send auth info
+    if (c->error == 0)
+    {
+    }
+
+    g_object_unref (address);
+
+    return c;
+}
+
+xcb_connection_t *
+xcb_connect (const char *displayname, int *screenp)
+{
+    return xcb_connect_to_display_with_auth_info(displayname, NULL, screenp);
+}
+
+int
+xcb_connection_has_error (xcb_connection_t *c)
+{
+    return c->error;
+}
+
+void
+xcb_disconnect (xcb_connection_t *c)
+{
+    free (c->display);
+    if (c->socket)
+        g_object_unref (c->socket);
+    free (c);
+}

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index e4c81c4f70b33bce7fb7400b98ed1f493f7eab02..bfcbf89d233f0ca4ddbffa16390002951a5c4ba1 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -120,14 +120,6 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("%s LOG-LAYOUT", greeter_id);
-    if (strcmp (request, r) == 0)
-    {
-        const gchar *layout;
-        layout = lightdm_layout_get_name (lightdm_get_layout ());
-        status_notify ("%s LOG-LAYOUT LAYOUT='%s'", greeter_id, layout ? layout : "");
-    }
-
     r = g_strdup_printf ("%s LOG-LAYOUT USERNAME=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
@@ -159,29 +151,6 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("%s LOG-VARIANTS LAYOUT=", greeter_id);
-    if (g_str_has_prefix (request, r))
-    {
-        GList *layouts, *iter;
-        const gchar *layout_prefix;
-
-        layout_prefix = request + strlen (r);
-        layouts = lightdm_get_layouts ();
-
-        for (iter = layouts; iter; iter = iter->next)
-        {
-            LightDMLayout *layout;
-            const gchar *name;
-
-            layout = (LightDMLayout *) iter->data;
-            name = lightdm_layout_get_name (layout);
-
-            if (g_str_has_prefix (name, layout_prefix))
-                status_notify ("%s LOG-VARIANTS LAYOUT='%s'", greeter_id, name);
-        }
-    }
-    g_free (r);
-
     r = g_strdup_printf ("%s LOG-LANGUAGE USERNAME=", greeter_id);  
     if (g_str_has_prefix (request, r))
     {
@@ -196,74 +165,74 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-SUSPEND", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-SUSPEND", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_suspend = lightdm_get_can_suspend ();
-        status_notify ("GREETER %s CAN-SUSPEND ALLOWED=%s", getenv ("DISPLAY"), can_suspend ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-SUSPEND ALLOWED=%s", greeter_id, can_suspend ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s SUSPEND", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s SUSPEND", greeter_id);
     if (strcmp (request, r) == 0)
     {
         GError *error = NULL;
         if (!lightdm_suspend (&error))
-            status_notify ("GREETER %s FAIL-SUSPEND", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-SUSPEND", greeter_id);
         g_clear_error (&error);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-HIBERNATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-HIBERNATE", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_hibernate = lightdm_get_can_hibernate ();
-        status_notify ("GREETER %s CAN-HIBERNATE ALLOWED=%s", getenv ("DISPLAY"), can_hibernate ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-HIBERNATE ALLOWED=%s", greeter_id, can_hibernate ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s HIBERNATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s HIBERNATE", greeter_id);
     if (strcmp (request, r) == 0)
     {
         GError *error = NULL;
         if (!lightdm_hibernate (&error))
-            status_notify ("GREETER %s FAIL-HIBERNATE", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-HIBERNATE", greeter_id);
         g_clear_error (&error);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-RESTART", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-RESTART", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_restart = lightdm_get_can_restart ();
-        status_notify ("GREETER %s CAN-RESTART ALLOWED=%s", getenv ("DISPLAY"), can_restart ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-RESTART ALLOWED=%s", greeter_id, can_restart ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s RESTART", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s RESTART", greeter_id);
     if (strcmp (request, r) == 0)
     {
         GError *error = NULL;
         if (!lightdm_restart (&error))
-            status_notify ("GREETER %s FAIL-RESTART", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-RESTART", greeter_id);
         g_clear_error (&error);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-SHUTDOWN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-SHUTDOWN", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_shutdown = lightdm_get_can_shutdown ();
-        status_notify ("GREETER %s CAN-SHUTDOWN ALLOWED=%s", getenv ("DISPLAY"), can_shutdown ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-SHUTDOWN ALLOWED=%s", greeter_id, can_shutdown ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s SHUTDOWN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s SHUTDOWN", greeter_id);
     if (strcmp (request, r) == 0)
     {
         GError *error = NULL;
         if (!lightdm_shutdown (&error))
-            status_notify ("GREETER %s FAIL-SHUTDOWN", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-SHUTDOWN", greeter_id);
         g_clear_error (&error);
     }
     g_free (r);

diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
index 35729d0e3293b9be24826d075dc9a67a0733a055..b5b02eee6d0777f00a43605a8b929d946a7ef00e 100755 (executable)
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -93,7 +93,7 @@ def request_cb (channel, condition):
             layout = ''
         status_notify ('%s LOG-LAYOUT USERNAME=%s LAYOUT=%s' % (greeter_id, username, layout))
 
-    r = '%s LOG-LANGUAGE USERNAME=' % greeter_id  
+    r = '%s LOG-LANGUAGE USERNAME=' % greeter_id
     if request.startswith (r):
         username = request[len(r):]
         user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username)
@@ -102,65 +102,65 @@ def request_cb (channel, condition):
             language = ''
         status_notify ('%s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (greeter_id, username, language))
 
-    r = 'GREETER %s GET-CAN-SUSPEND' % os.getenv ('DISPLAY')
+    r = '%s GET-CAN-SUSPEND' % greeter_id
     if request == r:
         if LightDM.get_can_suspend ():
             allowed = "TRUE"
         else:
             allowed = "FALSE"
-        status_notify ('GREETER %s CAN-SUSPEND ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed))
+        status_notify ('%s CAN-SUSPEND ALLOWED=%s' % (greeter_id, allowed))
 
-    r = 'GREETER %s SUSPEND' % os.getenv ('DISPLAY')
+    r = '%s SUSPEND' % greeter_id
     if request == r:
         try:
             LightDM.suspend ()
         except:
-            status_notify ('GREETER %s FAIL-SUSPEND' % os.getenv ('DISPLAY'))
+            status_notify ('%s FAIL-SUSPEND' % greeter_id)
 
-    r = 'GREETER %s GET-CAN-HIBERNATE' % os.getenv ('DISPLAY')
+    r = '%s GET-CAN-HIBERNATE' % greeter_id
     if request == r:
         if LightDM.get_can_hibernate ():
             allowed = "TRUE"
         else:
             allowed = "FALSE"
-        status_notify ('GREETER %s CAN-HIBERNATE ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed))
+        status_notify ('%s CAN-HIBERNATE ALLOWED=%s' % (greeter_id, allowed))
 
-    r = 'GREETER %s HIBERNATE' % os.getenv ('DISPLAY')
+    r = '%s HIBERNATE' % greeter_id
     if request == r:
         try:
             LightDM.hibernate ()
         except:
-            status_notify ('GREETER %s FAIL-HIBERNATE' % os.getenv ('DISPLAY'))
+            status_notify ('%s FAIL-HIBERNATE' % greeter_id)
 
-    r = 'GREETER %s GET-CAN-RESTART' % os.getenv ('DISPLAY')
+    r = '%s GET-CAN-RESTART' % greeter_id
     if request == r:
         if LightDM.get_can_restart ():
             allowed = "TRUE"
         else:
             allowed = "FALSE"
-        status_notify ('GREETER %s CAN-RESTART ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed))
+        status_notify ('%s CAN-RESTART ALLOWED=%s' % (greeter_id, allowed))
 
-    r = 'GREETER %s RESTART' % os.getenv ('DISPLAY')
+    r = '%s RESTART' % greeter_id
     if request == r:
         try:
             LightDM.restart ()
         except:
-            status_notify ('GREETER %s FAIL-RESTART' % os.getenv ('DISPLAY'))
+            status_notify ('%s FAIL-RESTART' % greeter_id)
 
-    r = 'GREETER %s GET-CAN-SHUTDOWN' % os.getenv ('DISPLAY')
+    r = '%s GET-CAN-SHUTDOWN' % greeter_id
     if request == r:
         if LightDM.get_can_shutdown ():
             allowed = "TRUE"
         else:
             allowed = "FALSE"
-        status_notify ('GREETER %s CAN-SHUTDOWN ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed))
+        status_notify ('%s CAN-SHUTDOWN ALLOWED=%s' % (greeter_id, allowed))
 
-    r = 'GREETER %s SHUTDOWN' % os.getenv ('DISPLAY')
+    r = '%s SHUTDOWN' % greeter_id
     if request == r:
         try:
             LightDM.shutdown ()
         except:
-            status_notify ('GREETER %s FAIL-SHUTDOWN' % os.getenv ('DISPLAY'))
+            status_notify ('%s FAIL-SHUTDOWN' % greeter_id)
 
     return True
 
@@ -175,7 +175,7 @@ status_notify ('%s START' % greeter_id)
 (host, display_number) = display.split (':')
 if host == '':
     x_socket = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM)
-    x_socket.connect ('/tmp/.X11-unix/X%s' % display_number)
+    x_socket.connect (os.getenv ('LIGHTDM_TEST_ROOT') + '/tmp/' + display)
 else:
     x_socket = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
     x_socket.connect ((host, 6000 + int (display_number)))
@@ -193,11 +193,6 @@ def pad (value):
         return value + '\x00' * (4 - len (value) % 4)
     else:
         return value
-x_socket.send (struct.pack ('!cxHHHHxx', 'B', 11, 0, len (auth_name), len (auth_data)) + pad (auth_name) + pad (auth_data))
-data = x_socket.recv (1024)
-if ord (data[0]) != 1:
-    status_notify ('%s FAIL-CONNECT-XSERVER' % greeter_id)
-    exit (1)
 
 status_notify ('%s CONNECT-XSERVER' % (greeter_id))
 

diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index d1bb5d6cac36ebcfdbc5e3152acfd37cabc1da56..b6a591deab168744db429e7699ccbc3fac79b0c3 100644 (file)
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -126,67 +126,67 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-SUSPEND", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-SUSPEND", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_suspend = power->canSuspend ();
-        status_notify ("GREETER %s CAN-SUSPEND ALLOWED=%s", getenv ("DISPLAY"), can_suspend ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-SUSPEND ALLOWED=%s", greeter_id, can_suspend ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s SUSPEND", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s SUSPEND", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!power->suspend ())
-            status_notify ("GREETER %s FAIL-SUSPEND", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-SUSPEND", greeter_id);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-HIBERNATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-HIBERNATE", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_hibernate = power->canHibernate ();
-        status_notify ("GREETER %s CAN-HIBERNATE ALLOWED=%s", getenv ("DISPLAY"), can_hibernate ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-HIBERNATE ALLOWED=%s", greeter_id, can_hibernate ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s HIBERNATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s HIBERNATE", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!power->hibernate ())
-            status_notify ("GREETER %s FAIL-HIBERNATE", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-HIBERNATE", greeter_id);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-RESTART", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-RESTART", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_restart = power->canRestart ();
-        status_notify ("GREETER %s CAN-RESTART ALLOWED=%s", getenv ("DISPLAY"), can_restart ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-RESTART ALLOWED=%s", greeter_id, can_restart ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s RESTART", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s RESTART", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!power->restart ())
-            status_notify ("GREETER %s FAIL-RESTART", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-RESTART", greeter_id);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s GET-CAN-SHUTDOWN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s GET-CAN-SHUTDOWN", greeter_id);
     if (strcmp (request, r) == 0)
     {
         gboolean can_shutdown = power->canShutdown ();
-        status_notify ("GREETER %s CAN-SHUTDOWN ALLOWED=%s", getenv ("DISPLAY"), can_shutdown ? "TRUE" : "FALSE");
+        status_notify ("%s CAN-SHUTDOWN ALLOWED=%s", greeter_id, can_shutdown ? "TRUE" : "FALSE");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s SHUTDOWN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s SHUTDOWN", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!power->shutdown ())
-            status_notify ("GREETER %s FAIL-SHUTDOWN", getenv ("DISPLAY"));
+            status_notify ("%s FAIL-SHUTDOWN", greeter_id);
     }
     g_free (r);
 }

diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 227a4f725767da1bf45370cb72e2195dddfc8e26..d64f5f685ab140dcb705f9b81d61e53fc2c8609b 100644 (file)
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -12,7 +12,7 @@
 #include <pwd.h>
 
 /* Timeout in ms waiting for the status we expect */
-#define STATUS_TIMEOUT 2000
+#define STATUS_TIMEOUT 4000
 
 /* Timeout in ms to wait for SIGTERM to be handled by a child process */
 #define KILL_TIMEOUT 2000

diff --git a/tests/src/x-server.c b/tests/src/x-server.c
index 9e76f80d20095d3d3e57432cc56245d325ac19d5..0c9182ab12505b7f21906485e920254f0cde6735 100644 (file)
--- a/tests/src/x-server.c
+++ b/tests/src/x-server.c
@@ -10,43 +10,13 @@
 #include <gio/gio.h>
 #include <gio/gunixsocketaddress.h>
 
-#include "x-common.h"
 #include "x-server.h"
 
 G_DEFINE_TYPE (XServer, x_server, G_TYPE_OBJECT);
-G_DEFINE_TYPE (XScreen, x_screen, G_TYPE_OBJECT);
-G_DEFINE_TYPE (XVisual, x_visual, G_TYPE_OBJECT);
 G_DEFINE_TYPE (XClient, x_client, G_TYPE_OBJECT);
 
 #define MAXIMUM_REQUEST_LENGTH 65535
 
-enum
-{
-    Failed = 0,
-    Success = 1,
-    Authenticate = 2
-};
-
-enum
-{
-    Error = 0,
-    Reply = 1,
-};
-
-enum
-{
-    InternAtom = 16,
-    GetProperty = 20,
-    QueryExtension = 98,
-    kbUseExtension = 200
-};
-
-enum
-{
-    BadAtom = 5,
-    BadImplementation = 17
-};
-
 enum {
     X_SERVER_CLIENT_CONNECTED,
     X_SERVER_CLIENT_DISCONNECTED,
@@ -54,40 +24,14 @@ enum {
 };
 static guint x_server_signals[X_SERVER_LAST_SIGNAL] = { 0 };
 
-typedef struct
-{
-    guint8 depth;
-    guint8 bits_per_pixel;
-    guint8 scanline_pad;
-} PixmapFormat;
-
 struct XServerPrivate
 {
-    gchar *vendor;
-
     gint display_number;
-  
-    guint32 motion_buffer_size;
-    guint8 image_byte_order;
-    guint8 bitmap_format_bit_order;
-  
-    guint8 min_keycode;
-    guint8 max_keycode;
 
-    GList *pixmap_formats;  
-    GList *screens;
-
-    gboolean listen_unix;
-    gboolean listen_tcp;
-    gint tcp_port;
     gchar *socket_path;
-    GSocket *unix_socket;
-    GIOChannel *unix_channel;
-    GSocket *tcp_socket;
-    GIOChannel *tcp_channel;
+    GSocket *socket;
+    GIOChannel *channel;
     GHashTable *clients;
-    GHashTable *atoms;
-    gint next_atom_index;
 };
 
 struct XClientPrivate
@@ -95,217 +39,33 @@ struct XClientPrivate
     XServer *server;
     GSocket *socket;  
     GIOChannel *channel;
-    guint8 byte_order;
-    gboolean connected;
-    guint16 sequence_number;
-};
-
-struct XScreenPrivate
-{
-    guint32 white_pixel;
-    guint32 black_pixel;
-    guint32 current_input_masks;
-    guint16 width_in_pixels;
-    guint16 height_in_pixels;
-    guint16 width_in_millimeters;
-    guint16 height_in_millimeters;
-    GList *visuals;
-};
-
-struct XVisualPrivate
-{
-    guint32 id;
-    guint8 depth;
-    guint8 class;
-    guint8 bits_per_rgb_value;
-    guint16 colormap_entries;
-    guint32 red_mask;
-    guint32 green_mask;
-    guint32 blue_mask;
 };
 
 enum
 {
-    X_CLIENT_CONNECT,
     X_CLIENT_DISCONNECTED,
     X_CLIENT_LAST_SIGNAL
 };
 static guint x_client_signals[X_CLIENT_LAST_SIGNAL] = { 0 };
 
-GInetAddress *
-x_client_get_address (XClient *client)
-{
-    GSocketAddress *socket_address;
-    GError *error = NULL;
-
-    socket_address = g_socket_get_remote_address (client->priv->socket, &error);
-    if (error)
-        g_warning ("Error getting remote socket address");
-    g_clear_error (&error);
-    if (!socket_address)
-        return NULL;
-
-    if (G_IS_INET_SOCKET_ADDRESS (socket_address))
-        return g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address));
-    else
-        return NULL;
-}
-
 void
 x_client_send_failed (XClient *client, const gchar *reason)
 {
-    guint8 buffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0, length_offset;
-
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Failed, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, strlen (reason), &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MAJOR_VERSION, &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MINOR_VERSION, &n_written);
-    length_offset = n_written;
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written);
-    write_padded_string (buffer, MAXIMUM_REQUEST_LENGTH, reason, &n_written);
-
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - length_offset) / 4, &length_offset);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0);
+    gchar *message;
+  
+    message = g_strdup_printf ("FAILED:%s", reason);
+    send (g_io_channel_unix_get_fd (client->priv->channel), message, strlen (message), 0);
+    g_free (message);
 }
 
 void 
 x_client_send_success (XClient *client)
 {
-    XServer *server = client->priv->server;
-    guint8 buffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0, length_offset;
-    GList *link;
-
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Success, &n_written);
-    write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MAJOR_VERSION, &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MINOR_VERSION, &n_written);
-    length_offset = n_written;
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written);
-    write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_RELEASE_NUMBER, &n_written);
-    write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0x00a00000, &n_written); // resource-id-base
-    write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0x001fffff, &n_written); // resource-id-mask
-    write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, server->priv->motion_buffer_size, &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, strlen (client->priv->server->priv->vendor), &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, MAXIMUM_REQUEST_LENGTH, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, g_list_length (server->priv->screens), &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, g_list_length (server->priv->pixmap_formats), &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->image_byte_order, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->bitmap_format_bit_order, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 32, &n_written); // bitmap-format-scanline-unit
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 32, &n_written); // bitmap-format-scanline-pad
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->min_keycode, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->max_keycode, &n_written);
-    write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written);
-    write_padded_string (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->server->priv->vendor, &n_written);
-
-    for (link = server->priv->pixmap_formats; link; link = link->next)
-    {
-        PixmapFormat *format = link->data;
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->depth, &n_written);
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->bits_per_pixel, &n_written);
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->scanline_pad, &n_written);
-        write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 5, &n_written);
-    }
-
-    for (link = server->priv->screens; link; link = link->next)
-    {
-        XScreen *screen = link->data;
-        guint8 depth, n_depths = 0;
-        gsize n_depths_offset;
-
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 87, &n_written); // root
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 32, &n_written); // default-colormap
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->white_pixel, &n_written);
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->black_pixel, &n_written);
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->current_input_masks, &n_written);
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->width_in_pixels, &n_written);
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->height_in_pixels, &n_written);
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->width_in_millimeters, &n_written);
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->height_in_millimeters, &n_written);
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); // min-installed-maps
-        write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); // max-installed-maps
-        write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 34, &n_written); // root-visual
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); // backing-stores
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); // save-unders
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 24, &n_written); // root-depth
-        n_depths_offset = n_written;
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written);
-
-        depth = 0;
-        while (TRUE)
-        {
-            GList *visual_link;
-            guint16 n_visuals = 0;
-
-            /* Find the next depth to this one */
-            guint8 next_depth = 255;
-            for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next)
-            {
-                XVisual *visual = visual_link->data;
-                if (visual->priv->depth > depth && visual->priv->depth < next_depth)
-                    next_depth = visual->priv->depth;
-            }
-            if (next_depth == 255)
-                break;
-            depth = next_depth;
-            n_depths++;
-
-            for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next)
-            {
-                XVisual *visual = visual_link->data;
-                if (visual->priv->depth == depth)
-                    n_visuals++;
-            }
-
-            write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, depth, &n_written);
-            write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written);
-            write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, n_visuals, &n_written);
-            write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written);
-
-            for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next)
-            {
-                XVisual *visual = visual_link->data;
-
-                if (visual->priv->depth != depth)
-                    continue;
-
-                write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->id, &n_written);
-                write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, visual->priv->class, &n_written);
-                write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, visual->priv->bits_per_rgb_value, &n_written);
-                write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->colormap_entries, &n_written);
-                write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->red_mask, &n_written);
-                write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->green_mask, &n_written);
-                write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->blue_mask, &n_written);
-                write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written);
-            }
-        }
-
-        write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, n_depths, &n_depths_offset);
-    }
-
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - length_offset) / 4, &length_offset);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0);
-}
-
-void
-x_client_send_error (XClient *client, int type, int major, int minor)
-{
-    guint8 buffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0;
-
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Error, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, type, &n_written);
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written);
-    write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* resourceID */
-    write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, minor, &n_written);
-    write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, major, &n_written);
-    write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 21, &n_written);
+    gchar *message;
 
-    send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0);
+    message = g_strdup ("SUCCESS");
+    send (g_io_channel_unix_get_fd (client->priv->channel), message, strlen (message), 0);
+    g_free (message);
 }
 
 void
@@ -318,7 +78,6 @@ static void
 x_client_init (XClient *client)
 {
     client->priv = G_TYPE_INSTANCE_GET_PRIVATE (client, x_client_get_type (), XClientPrivate);
-    client->priv->sequence_number = 1;
 }
 
 static void
@@ -326,14 +85,6 @@ x_client_class_init (XClientClass *klass)
 {
     g_type_class_add_private (klass, sizeof (XClientPrivate));
 
-    x_client_signals[X_CLIENT_CONNECT] =
-        g_signal_new ("connect",
-                      G_TYPE_FROM_CLASS (klass),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (XClientClass, connect),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
-                      G_TYPE_NONE, 1, G_TYPE_POINTER);
     x_client_signals[X_CLIENT_DISCONNECTED] =
         g_signal_new ("disconnected",
                       G_TYPE_FROM_CLASS (klass),
@@ -349,387 +100,9 @@ x_server_new (gint display_number)
 {
     XServer *server = g_object_new (x_server_get_type (), NULL);
     server->priv->display_number = display_number;
-    server->priv->tcp_port = 6000 + display_number;
     return server;
 }
 
-XScreen *
-x_server_add_screen (XServer *server, guint32 white_pixel, guint32 black_pixel, guint32 current_input_masks, guint16 width_in_pixels, guint16 height_in_pixels, guint16 width_in_millimeters, guint16 height_in_millimeters)
-{
-    XScreen *screen;
-
-    screen = g_object_new (x_screen_get_type (), NULL);
-
-    screen->priv->white_pixel = white_pixel;
-    screen->priv->black_pixel = black_pixel;
-    screen->priv->current_input_masks = current_input_masks;
-    screen->priv->width_in_pixels = width_in_pixels;
-    screen->priv->height_in_pixels = height_in_pixels;
-    screen->priv->width_in_millimeters = width_in_millimeters;
-    screen->priv->height_in_millimeters = height_in_millimeters;
-  
-    server->priv->screens = g_list_append (server->priv->screens, screen);
-
-    return screen;
-}
-
-void
-x_server_add_pixmap_format (XServer *server, guint8 depth, guint8 bits_per_pixel, guint8 scanline_pad)
-{
-    PixmapFormat *format;
-  
-    format = g_malloc0 (sizeof (PixmapFormat));
-    format->depth = depth;
-    format->bits_per_pixel = bits_per_pixel;
-    format->scanline_pad = scanline_pad;
-    server->priv->pixmap_formats = g_list_append (server->priv->pixmap_formats, format);
-}
-
-void
-x_server_set_listen_unix (XServer *server, gboolean listen_unix)
-{
-    server->priv->listen_unix = listen_unix;
-}
-
-void
-x_server_set_listen_tcp (XServer *server, gboolean listen_tcp)
-{
-    server->priv->listen_tcp = listen_tcp;
-}
-
-XVisual *
-x_screen_add_visual (XScreen *screen, guint8 depth, guint8 class, guint8 bits_per_rgb_value, guint16 colormap_entries, guint32 red_mask, guint32 green_mask, guint32 blue_mask)
-{
-    XVisual *visual;
-
-    visual = g_object_new (x_visual_get_type (), NULL);
-    visual->priv->id = 0; // FIXME
-    visual->priv->depth = depth;
-    visual->priv->class = class;
-    visual->priv->bits_per_rgb_value = bits_per_rgb_value;
-    visual->priv->colormap_entries = colormap_entries;
-    visual->priv->red_mask = red_mask;
-    visual->priv->green_mask = green_mask;
-    visual->priv->blue_mask = blue_mask;
-    
-    return visual;
-}
-
-static void
-decode_connection_request (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    guint8 byte_order;
-    gsize offset = 0;
-    guint16 n;
-    XConnect *message;
-
-    byte_order = read_card8 (buffer, buffer_length, &offset);
-    if (!(byte_order == 'B' || byte_order == 'l'))
-    {
-        g_warning ("Invalid byte order");
-        return;
-    }
-  
-    message = g_malloc0 (sizeof (XConnect));
-
-    message->byte_order = byte_order == 'B' ? X_BYTE_ORDER_MSB : X_BYTE_ORDER_LSB;
-    read_padding (1, &offset);
-    message->protocol_major_version = read_card16 (buffer, buffer_length, message->byte_order, &offset);
-    message->protocol_minor_version = read_card16 (buffer, buffer_length, message->byte_order, &offset);
-    n = read_card16 (buffer, buffer_length, message->byte_order, &offset);
-    message->authorization_protocol_data_length = read_card16 (buffer, buffer_length, message->byte_order, &offset);
-    read_padding (2, &offset);
-    message->authorization_protocol_name = read_padded_string (buffer, buffer_length, n, &offset);
-    message->authorization_protocol_data = read_string8 (buffer, buffer_length, message->authorization_protocol_data_length, &offset);
-    read_padding (pad (message->authorization_protocol_data_length), &offset);
-
-    /* Store information about the client */
-    client->priv->byte_order = message->byte_order;
-    client->priv->connected = TRUE;
-
-    g_signal_emit (client, x_client_signals[X_CLIENT_CONNECT], 0, message);
-
-    g_free (message->authorization_protocol_name);
-    g_free (message->authorization_protocol_data);
-    g_free (message);
-}
-
-static void
-process_intern_atom (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    /* Decode */
-
-    gsize offset = 0;
-    guint8 onlyIfExists;
-    guint16 n;
-    gchar *name;
-    int atom;
-
-    read_padding (1, &offset); /* reqType */
-    onlyIfExists = read_card8 (buffer, buffer_length, &offset);
-    read_padding (2, &offset); /* length */
-    n = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset);
-    read_padding (2, &offset);
-    name = read_padded_string (buffer, buffer_length, n, &offset);
-
-    /* Process */
-
-    atom = client->priv->server->priv->next_atom_index++;
-
-    if (onlyIfExists)
-    {
-        g_free (name);
-        if (!g_hash_table_lookup (client->priv->server->priv->atoms, GINT_TO_POINTER (atom)))
-        {
-            x_client_send_error (client, BadAtom, InternAtom, 0);
-            return;
-        }
-    }
-    else
-        g_hash_table_insert (client->priv->server->priv->atoms, GINT_TO_POINTER (atom), name);
-
-    /* Reply */
-
-    guint8 outBuffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0;
-
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written);
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written);
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written);
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, atom, &n_written);
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0);
-}
-
-static void
-process_get_property (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    /* Decode */
-
-    gsize offset = 0;
-    guint8 delete;
-    guint32 property;
-    guint32 type;
-
-    read_padding (1, &offset); /* reqType */
-    delete = read_card8 (buffer, buffer_length, &offset);
-    read_padding (2, &offset); /* length */
-    read_padding (4, &offset); /* window */
-    property = read_card32 (buffer, buffer_length, client->priv->byte_order, &offset);
-    type = read_card32 (buffer, buffer_length, client->priv->byte_order, &offset);
-    read_padding (4, &offset); /* longOffset */
-    read_padding (4, &offset); /* longLength */
-
-    /* Process */
-
-    gchar *name = g_hash_table_lookup (client->priv->server->priv->atoms, GINT_TO_POINTER (property));
-    GString *reply = NULL;
-    guint8 format = 8;
-
-    if (g_strcmp0 (name, "_XKB_RULES_NAMES") == 0)
-    {
-        GKeyFile *config;
-
-        config = g_key_file_new ();
-        g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL);
-
-        reply = g_string_new ("");
-
-        g_string_append (reply, "evdev"); /* rules file */
-        g_string_append_c (reply, 0); /* embedded null byte */
-
-        g_string_append (reply, "pc105"); /* model name */
-        g_string_append_c (reply, 0); /* embedded null byte */
-
-        if (g_key_file_has_key (config, "test-xserver-config", "keyboard-layout", NULL))
-            g_string_append (reply, g_key_file_get_string (config, "test-xserver-config", "keyboard-layout", NULL));
-        else
-            g_string_append (reply, "us");
-        g_string_append_c (reply, 0); /* embedded null byte */
-
-        if (g_key_file_has_key (config, "test-xserver-config", "keyboard-variant", NULL))
-            g_string_append (reply, g_key_file_get_string (config, "test-xserver-config", "keyboard-variant", NULL));
-        g_string_append_c (reply, 0); /* embedded null byte */
-
-        /* no xkb options */
-        g_string_append_c (reply, 0); /* embedded null byte */
-
-        g_key_file_free (config);
-    }
-
-    if (name && delete)
-        g_hash_table_remove (client->priv->server->priv->atoms, GINT_TO_POINTER (property));
-
-    /* Reply */
-
-    if (!reply)
-    {
-        x_client_send_error (client, BadImplementation, GetProperty, 0);
-        return;
-    }
-
-    guint8 outBuffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0, length_offset, packet_start;
-
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written);
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, format, &n_written);
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written);
-    length_offset = n_written;
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, type, &n_written);
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* bytesAfter */
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, reply->len, &n_written);
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 12, &n_written);
-    packet_start = n_written;
-
-    write_string8 (outBuffer, MAXIMUM_REQUEST_LENGTH, (guint8 *) reply->str, reply->len, &n_written);
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, pad (reply->len), &n_written);
-
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - packet_start) / 4, &length_offset);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0);
-
-    /* Cleanup */
-
-    g_string_free (reply, TRUE);
-}
-
-static void
-process_query_extension (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    /* Decode */
-
-    gsize offset = 0;
-    guint8 n;
-    gchar *name;
-
-    read_padding (1, &offset); /* reqType */
-    read_padding (1, &offset); /* pad */
-    read_padding (2, &offset); /* length */
-    n = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset);
-    read_padding (2, &offset); /* pad */
-    name = read_padded_string (buffer, buffer_length, n, &offset);
-
-    /* Process */
-
-    guint8 present = 0;
-    if (g_strcmp0 (name, "XKEYBOARD") == 0)
-        present = 1;
-
-    /* Reply */
-
-    guint8 outBuffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0;
-
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written);
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written);
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written);
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, present, &n_written);
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, kbUseExtension, &n_written); /* major_opcode */
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); /* first_event */
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); /* first_error */
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0);
-
-    /* Cleanup */
-
-    g_free (name);
-}
-
-static void
-process_kb_use_extension (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    /* Nothing to decode, we don't care about parameters */
-
-    /* Reply */
-
-    guint8 outBuffer[MAXIMUM_REQUEST_LENGTH];
-    gsize n_written = 0;
-
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written);
-    write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); /* supported */
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written);
-    write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); /* serverMajor */
-    write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* serverMinor */
-    write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written);
-
-    send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0);
-}
-
-static void
-decode_request (XClient *client, const guint8 *buffer, gssize buffer_length)
-{
-    int opcode;
-    gsize offset = 0;
-
-    while (offset < buffer_length)
-    {
-        gsize start_offset;
-        guint16 length;
-
-        start_offset = offset;
-        opcode = read_card8 (buffer, buffer_length, &offset);
-        read_card8 (buffer, buffer_length, &offset);
-        length = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset) * 4;
-
-        g_debug ("Got opcode=%d length=%d", opcode, length);
-        offset = start_offset + length;
-
-        switch (opcode)
-        {
-        case InternAtom:
-            process_intern_atom (client, buffer + start_offset, length);
-            break;
-        case GetProperty:
-            process_get_property (client, buffer + start_offset, length);
-            break;
-        case QueryExtension:
-            process_query_extension (client, buffer + start_offset, length);
-            break;
-        case kbUseExtension:
-            process_kb_use_extension (client, buffer + start_offset, length);
-            break;
-        default:
-            /* Send an error because we don't understand the opcode yet */
-            x_client_send_error (client, BadImplementation, opcode, 0);
-            break;
-        }
-
-        client->priv->sequence_number++;
-    }
-}
-
-static gboolean
-socket_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
-{
-    XClient *client = data;
-    guint8 buffer[MAXIMUM_REQUEST_LENGTH];
-    gssize n_read;
-
-    n_read = recv (g_io_channel_unix_get_fd (channel), buffer, MAXIMUM_REQUEST_LENGTH, 0);
-    if (n_read < 0)
-        g_warning ("Error reading from socket: %s", strerror (errno));
-    else if (n_read == 0)
-    {
-        g_signal_emit (client, x_client_signals[X_CLIENT_DISCONNECTED], 0);
-        return FALSE;
-    }
-    else
-    {
-        if (client->priv->connected)
-            decode_request (client, buffer, n_read);
-        else
-            decode_connection_request (client, buffer, n_read);
-    }
-
-    return TRUE;
-}
-
 static void
 x_client_disconnected_cb (XClient *client, XServer *server)
 {
@@ -746,10 +119,7 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
     XClient *client;
     GError *error = NULL;
 
-    if (channel == server->priv->unix_channel)
-        data_socket = g_socket_accept (server->priv->unix_socket, NULL, &error);
-    else
-        data_socket = g_socket_accept (server->priv->tcp_socket, NULL, &error);
+    data_socket = g_socket_accept (server->priv->socket, NULL, &error);
     if (error)
         g_warning ("Error accepting connection: %s", strerror (errno));
     g_clear_error (&error);
@@ -762,7 +132,6 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
     client->priv->socket = data_socket;
     client->priv->channel = g_io_channel_unix_new (g_socket_get_fd (data_socket));
     g_hash_table_insert (server->priv->clients, client->priv->channel, client);
-    g_io_add_watch (client->priv->channel, G_IO_IN, socket_data_cb, client);
 
     g_signal_emit (server, x_server_signals[X_SERVER_CLIENT_CONNECTED], 0, client);
 
@@ -772,39 +141,23 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
 gboolean
 x_server_start (XServer *server)
 {
-    if (server->priv->listen_unix)
-    {
-        GError *error = NULL;
-      
-        server->priv->socket_path = g_strdup_printf ("/tmp/.X11-unix/X%d", server->priv->display_number);
+    gchar *name;
+    GError *error = NULL;
 
-        server->priv->unix_socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error);
-        if (!server->priv->unix_socket ||
-            !g_socket_bind (server->priv->unix_socket, g_unix_socket_address_new (server->priv->socket_path), TRUE, &error) ||
-            !g_socket_listen (server->priv->unix_socket, &error))
-        {
-            g_warning ("Error creating Unix X socket: %s", error->message);
-            return FALSE;
-        }
-        server->priv->unix_channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->unix_socket));
-        g_io_add_watch (server->priv->unix_channel, G_IO_IN, socket_connect_cb, server);
-    }
+    name = g_strdup_printf (":%d", server->priv->display_number);
+    server->priv->socket_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", name, NULL);
+    g_free (name);
 
-    if (server->priv->listen_tcp)
+    server->priv->socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error);
+    if (!server->priv->socket ||
+        !g_socket_bind (server->priv->socket, g_unix_socket_address_new (server->priv->socket_path), TRUE, &error) ||
+        !g_socket_listen (server->priv->socket, &error))
     {
-        GError *error = NULL;
-
-        server->priv->tcp_socket = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_TCP, &error);
-        if (!server->priv->tcp_socket ||
-            !g_socket_bind (server->priv->tcp_socket, g_inet_socket_address_new (g_inet_address_new_any (G_SOCKET_FAMILY_IPV4), server->priv->tcp_port), TRUE, &error) ||
-            !g_socket_listen (server->priv->tcp_socket, &error))
-        {
-            g_warning ("Error creating TCP/IP X socket: %s", error->message);
-            return FALSE;
-        }
-        server->priv->tcp_channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->tcp_socket));
-        g_io_add_watch (server->priv->tcp_channel, G_IO_IN, socket_connect_cb, server);
+        g_warning ("Error creating Unix X socket: %s", error->message);
+        return FALSE;
     }
+    server->priv->channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->socket));
+    g_io_add_watch (server->priv->channel, G_IO_IN, socket_connect_cb, server);
 
     return TRUE;
 }
@@ -819,93 +172,15 @@ static void
 x_server_init (XServer *server)
 {
     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, x_server_get_type (), XServerPrivate);
-    server->priv->vendor = g_strdup ("");
-    server->priv->min_keycode = 8;
-    server->priv->min_keycode = 255;
-    server->priv->screens = NULL;
-    server->priv->listen_unix = TRUE;
-    server->priv->listen_tcp = TRUE;
     server->priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, (GDestroyNotify) g_io_channel_unref, g_object_unref);
-    server->priv->atoms = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
-    server->priv->next_atom_index = 1;
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("PRIMARY"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SECONDARY"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ARC"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ATOM"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("BITMAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CARDINAL"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("COLORMAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CURSOR"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER0"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER1"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER2"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER3"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER4"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER5"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER6"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER7"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("DRAWABLE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FONT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("INTEGER"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("PIXMAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("POINT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RECTANGLE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RESOURCE_MANAGER"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_COLOR_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_BEST_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_BLUE_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_DEFAULT_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_GRAY_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_GREEN_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_RED_MAP"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRING"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("VISUALID"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WINDOW"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_COMMAND"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_HINTS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_CLIENT_MACHINE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ICON_NAME"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ICON_SIZE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_NAME"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_NORMAL_HINTS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_SIZE_HINTS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ZOOM_HINTS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("MIN_SPACE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("NORM_SPACE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("MAX_SPACE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("END_SPACE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUPERSCRIPT_X"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUPERSCRIPT_Y"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUBSCRIPT_X"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUBSCRIPT_Y"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("UNDERLINE_POSITION"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("UNDERLINE_THICKNESS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRIKEOUT_ASCENT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRIKEOUT_DESCENT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ITALIC_ANGLE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("X_HEIGHT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("QUAD_WIDTH"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WEIGHT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("POINT_SIZE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RESOLUTION"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("COPYRIGHT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("NOTICE"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FONT_NAME"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FAMILY_NAME"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FULL_NAME"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CAP_HEIGHT"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_CLASS"));
-    g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_TRANSIENT_FOR"));
 }
 
 static void
 x_server_finalize (GObject *object)
 {
     XServer *server = (XServer *) object;
-    g_free (server->priv->vendor);
     if (server->priv->socket_path)
         unlink (server->priv->socket_path);
-    g_hash_table_unref (server->priv->atoms);
     G_OBJECT_CLASS (x_server_parent_class)->finalize (object);
 }
 
@@ -932,27 +207,3 @@ x_server_class_init (XServerClass *klass)
                       g_cclosure_marshal_VOID__OBJECT,
                       G_TYPE_NONE, 1, x_client_get_type ());
 }
-
-static void
-x_screen_init (XScreen *screen)
-{
-    screen->priv = G_TYPE_INSTANCE_GET_PRIVATE (screen, x_screen_get_type (), XScreenPrivate);
-}
-
-static void
-x_screen_class_init (XScreenClass *klass)
-{
-    g_type_class_add_private (klass, sizeof (XScreenPrivate));
-}
-
-static void
-x_visual_init (XVisual *visual)
-{
-    visual->priv = G_TYPE_INSTANCE_GET_PRIVATE (visual, x_visual_get_type (), XVisualPrivate);
-}
-
-static void
-x_visual_class_init (XVisualClass *klass)
-{
-    g_type_class_add_private (klass, sizeof (XVisualPrivate));
-}

diff --git a/tests/src/x-server.h b/tests/src/x-server.h
index 402b23918a035c13ff0d10fc1ab3e941a37451c6..5f5b4728218c511583cc7bc43676166bfce1d4e7 100644 (file)
--- a/tests/src/x-server.h
+++ b/tests/src/x-server.h
@@ -6,20 +6,6 @@
 
 G_BEGIN_DECLS
 
-#define X_PROTOCOL_MAJOR_VERSION 11
-#define X_PROTOCOL_MINOR_VERSION 0
-
-#define X_RELEASE_NUMBER 0
-
-typedef struct
-{
-    guint8 byte_order;
-    guint16 protocol_major_version, protocol_minor_version;
-    gchar *authorization_protocol_name;
-    guint8 *authorization_protocol_data;
-    guint16 authorization_protocol_data_length;
-} XConnect;
-
 typedef struct XClientPrivate XClientPrivate;
 
 typedef struct
@@ -31,36 +17,9 @@ typedef struct
 typedef struct
 {
    GObjectClass parent_class;
-   void (*connect)(XClient *client, XConnect *message);
    void (*disconnected)(XClient *client);
 } XClientClass;
 
-typedef struct XScreenPrivate XScreenPrivate;
-
-typedef struct
-{
-   GObject         parent_instance;
-   XScreenPrivate *priv;
-} XScreen;
-
-typedef struct
-{
-   GObjectClass parent_class;
-} XScreenClass;
-
-typedef struct XVisualPrivate XVisualPrivate;
-
-typedef struct
-{
-   GObject         parent_instance;
-   XVisualPrivate *priv;
-} XVisual;
-
-typedef struct
-{
-   GObjectClass parent_class;
-} XVisualClass;
-
 typedef struct XServerPrivate XServerPrivate;
 
 typedef struct
@@ -80,28 +39,12 @@ GType x_server_get_type (void);
 
 XServer *x_server_new (gint display_number);
 
-XScreen *x_server_add_screen (XServer *server, guint32 white_pixel, guint32 black_pixel, guint32 current_input_masks, guint16 width_in_pixels, guint16 height_in_pixels, guint16 width_in_millimeters, guint16 height_in_millimeters);
-
-void x_server_add_pixmap_format (XServer *server, guint8 depth, guint8 bits_per_pixel, guint8 scanline_pad);
-
-void x_server_set_listen_unix (XServer *server, gboolean listen_unix);
-
-void x_server_set_listen_tcp (XServer *server, gboolean listen_tcp);
-
 gboolean x_server_start (XServer *server);
 
 gsize x_server_get_n_clients (XServer *server);
 
-GType x_screen_get_type (void);
-
-XVisual *x_screen_add_visual (XScreen *screen, guint8 depth, guint8 class, guint8 bits_per_rgb_value, guint16 colormap_entries, guint32 red_mask, guint32 green_mask, guint32 blue_mask);
-
-GType x_visual_get_type (void);
-
 GType x_client_get_type (void);
 
-GInetAddress *x_client_get_address (XClient *client);
-
 void x_client_send_failed (XClient *client, const gchar *reason);
 
 void x_client_send_success (XClient *client);

diff --git a/tests/test-default-keyboard-layout b/tests/test-default-keyboard-layout
deleted file mode 100755 (executable)
index 705b48a..0000000
--- a/tests/test-default-keyboard-layout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner default-keyboard-layout test-gobject-greeter

diff --git a/tests/test-keyboard-variants b/tests/test-keyboard-variants
deleted file mode 100755 (executable)
index 7d9742e..0000000
--- a/tests/test-keyboard-variants
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner keyboard-variants test-gobject-greeter