Refactor tests

diff --git a/NEWS b/NEWS
index 22403181f3e517056e0e78c2172bb96ff4674450..90ca1e10563369c4b72de4bcd926fce6c34b86d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
-Overview of changes in lightdm 1.6.0
+Overview of changes in lightdm 1.5.1
 
     * QLightDM: Add Qt5 version of the library: liblightdm-qt5-2
     * QLightDM: Add some missing role names in UsersModel
+    * QLightDM: Fix potential crash in QLightDM::UsersModel closedown.
+    * Improve guest session apparmor
+    * Run each test in its own /tmp dir so they can't interfere with eachother
 
 Overview of changes in lightdm 1.5.0
 

diff --git a/configure.ac b/configure.ac
index 45133752c2ecb41abf0e9df2ea5bfc75d0c1d7d6..b19553b17e19870106494ccb20eabaa10f82e565 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.5.0)
+AC_INIT(lightdm, 1.5.1)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])

diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index dadee1c6227ae989e91dbaf066779133ed93765c..95f67c7eb7d9aa13cbf2bc5f27178fefa890c8ed 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -12,24 +12,23 @@ autologin-guest=true
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (guest account attempts to start and fails)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 51a6b9acb7aaab177d7e5b32a1f7234de4b39bc5..1bac09a3d8849a3ab2028158b48d37f92150c864 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -11,46 +11,45 @@ autologin-guest=true
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Logout of session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-50 LOGOUT
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 330478e78fbe86cfc8c38894127ca3e67854a703..70775c5620055f746836dbfa4d7be86df526eb04 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -12,40 +12,39 @@ autologin-user-timeout=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Autologin timer expires
-#?GREETER :50 AUTOLOGIN-TIMER-EXPIRED
+#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
 
 # Trigger autologin
-#?*GREETER :50 AUTHENTICATE-AUTOLOGIN
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-50 AUTHENTICATE-AUTOLOGIN
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 2b987914832c929708350db183b8a649f55e24c4..c94bde08f2f7820bd7d4023c184494cba5c3eab3 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -11,25 +11,24 @@ autologin-guest=true
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GUEST-ACCOUNT REMOVE USERNAME=guest.*
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index ab1d727f036a7e124f056f6c72074ccfb897ce3f..1b8c31c428820419e8fc26993352eabb1a7e0040 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -12,24 +12,23 @@ user-session=invalid
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (session fails to start)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 d78b354d7b9efd4bd9d861739717fec6f9a75795..f1daa823e79f82d7263acef42b60fd0d90af8e76 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -11,24 +11,23 @@ autologin-user=invalid
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 3596ff184d891be5cdc12828ec3488c4ba73b0bd..43f7022ea3c2d400ab149d65205792c31df70f58 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -11,43 +11,42 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Autologin session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-50 LOGOUT
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Wait in case the greeter tries to log in immediately
 #?*WAIT
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 047719090a7e891f35da19548caeb2d7f9d6f49e..403165c0249e5161e40926846fd43b760aaa1022 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -11,24 +11,23 @@ autologin-user=new-authtok
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index cef39441588ef7be94d0275e391716cb8aaa78bb..dca7ce06a9fcf675eb483df6cef04e621684808a 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -11,24 +11,23 @@ autologin-user=always-password
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 9ef4e5e593ee1914aba25d4eff522e2dc9cfff36..445c9a64898828faa471ee95b7fc8c09c7bf52c9 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -11,20 +11,19 @@ autologin-user=have-session
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START NAME=alternative USER=have-session
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START NAME=alternative USER=have-session
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 086ae9b6f3ca320df2fca518fabe8f28bd51af1a..9c39d1a21f88f65eff28bec4968bf7842a9bae68 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -11,40 +11,39 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Crash session
-#?*SESSION :50 CRASH
+#?*SESSION-X-50 CRASH
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 1b3d57ec259dc4a4900a5c2bba8595373149e8cc..ccd6e30d9fd31b10d35f38b59d58ff0b2a56a101 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -11,34 +11,33 @@ autologin-user=session-error
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index 429c42d7a1534ba04242be8a385d7bd13a31d4fe..32034d5af79369600681910016811c5032727d27 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -12,36 +12,35 @@ autologin-user-timeout=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Autologin timer expires
-#?GREETER :50 AUTOLOGIN-TIMER-EXPIRED
+#?GREETER-X-50 AUTOLOGIN-TIMER-EXPIRED
 
 # Trigger autologin
-#?*GREETER :50 AUTHENTICATE-AUTOLOGIN
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 0bcf6ae9629f5a307763c0ea199369d1991445c7..7b50925198bbf20e3071684e8ac5045f186ea6f2 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -11,37 +11,36 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # XServer starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Crash X server
-#?*XSERVER :50 CRASH
+#?*XSERVER-50 CRASH
 
 # User session is terminated
-#?SESSION :50 TERMINATE SIGNAL=15
+#?SESSION-X-50 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index bc32b1006442c45bac7eb0b764c753a9c452c1b2..d7f8581593e704e6e392c050f878db9628c2ac1a 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -11,20 +11,19 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index d3860a19a2a6da705fa3daac7a3a65007a02d4ba..aefc939b18cd284836b9d44f93c3861c5e88264c 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -8,31 +8,30 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Start authentication
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Change user authentication
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password2
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password2
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index cacd8c3ad64038aec78b07684d6e281320ef62fe..5e514f4c0e7f28909a2ee2f36880f3d87f10afc6 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -11,24 +11,23 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check environment variable
-#?*SESSION :50 READ-ENV NAME=XDG_SESSION_COOKIE
-#?SESSION :50 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:50
+#?*SESSION-X-50 READ-ENV NAME=XDG_SESSION_COOKIE
+#?SESSION-X-50 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:50
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index 259d7265927a59a5bda14c2767dc561434874e18..9dd0ed608123ddf646247ea1acac09575aa214f4 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -11,24 +11,23 @@ autologin-user=crash-authenticate
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (authentication crashes)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 06dcb352d58f35ccba9becd9ff2978f206d6765c..403e963bc9ebdf1cccdd64a3278e3a6d3f37e1d8 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -11,34 +11,33 @@ autologin-user=cred-error
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index b55b86de4e3e52085d78345ea182c1dafaefe805..057ee8fcf5f7a0aa760bfef4456755a6bf05b4f2 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -11,34 +11,33 @@ autologin-user=cred-expired
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index 0ead338588605175ad7aea6e3f8782540208f126..7fd8c9ba9df64187bccc9da7ce593e2f143792e2 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -11,34 +11,33 @@ autologin-user=cred-unavail
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/default-keyboard-layout.conf b/tests/scripts/default-keyboard-layout.conf
index 3a560844d21679da067fe67e5f5a9ad6a90c5cb8..8da42588f7120f5d1610382d0462f7331149b1b4 100644 (file)
--- a/tests/scripts/default-keyboard-layout.conf
+++ b/tests/scripts/default-keyboard-layout.conf
@@ -12,27 +12,26 @@ keyboard-variant=azerty
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LAYOUT
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 LOG-LAYOUT LAYOUT='ara   azerty'
+#?*GREETER-X-50 LOG-LAYOUT
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 LOG-LAYOUT LAYOUT='ara  azerty'
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-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 caf42ffd46c69004d4bccf774162df39d0c9a083..a28d48574d107a40cfaceea1066c220150609de0 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -11,24 +11,23 @@ autologin-user=denied
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index b04d6379e7aa8f15cef9618d7af34297f76ef6e4..0d409097f2bb39692409f6c31490c69c0c4ac551 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -11,24 +11,23 @@ autologin-user=expired
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (Session fails)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 c2c4a1f8bc514adfa8ee51c4c30a0366d0277438..a1d96bcac59294d916962dfc45aff0335542bb30 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -11,18 +11,18 @@ return-value=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter fails to start
-#?GREETER :50 START
-#?GREETER :50 EXIT CODE=1
+#?GREETER-X-50 START
+#?GREETER-X-50 EXIT CODE=1
 
 # X server stopped
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 7cf0e8fe9f46f79841aa1ddb22673b2eeecfd353..c905e7fff155005412126bf59410e1e41be86e1f 100644 (file)
--- a/tests/scripts/greeter-not-installed.conf
+++ b/tests/scripts/greeter-not-installed.conf
@@ -11,16 +11,16 @@ return-value=1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Invalid greeter attempted, fails to start
 
 # X server stopped
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 84480222d19b557197d38201f6d0e22d8a08d091..43c16f27494890a040701a80e2a0f9a0bf17d208 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -8,42 +8,41 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Crash X server
-#?*XSERVER :50 CRASH
+#?*XSERVER-50 CRASH
 
 # Greeter quits
-#?GREETER :50 TERMINATE SIGNAL=15
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf
index 70f5afd37eb85b89f46512335984929456b4e127..c6350d18f833da3362e128fb2c746fe13e51afe9 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -11,24 +11,23 @@ autologin-user=group-member
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=group-member
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=group-member
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check we belong to the group for our user and the special group set by PAM
-#?*SESSION :50 LIST-GROUPS
-#?SESSION :50 LIST-GROUPS GROUPS=group-member,test-group
+#?*SESSION-X-50 LIST-GROUPS
+#?SESSION-X-50 LIST-GROUPS GROUPS=group-member,test-group
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 5f3e49ab06476b47a8bd8c5624e68ff1825bc4e0..9db8d48b5e6a4ebf44b89c6c965bf742536745a9 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -11,20 +11,19 @@ autologin-user=mount-home-dir
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=mount-home-dir
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=mount-home-dir
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 0431bf198732d6759f8c73c6c1a0aaf1986fe8c1..23ee808207079ad132122d792ea57f214b3bf3fe 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -11,20 +11,19 @@ autologin-user=make-home-dir
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=make-home-dir
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=make-home-dir
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf
index 0869052bb2f8ba78c1948c0ed20f2cbc70be4111..66b3a0887ee8736a86e7ae79961e43335e5f1acf 100644 (file)
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -8,31 +8,30 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LAYOUT USERNAME=have-layout
-#?GREETER :50 LOG-LAYOUT USERNAME=have-layout LAYOUT='us'
-#?*GREETER :50 LOG-LAYOUT USERNAME=have-layouts
-#?GREETER :50 LOG-LAYOUT USERNAME=have-layouts LAYOUT='fr      oss'
-#?*GREETER :50 LOG-LAYOUTS USERNAME=have-layouts
-#?GREETER :50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='fr     oss'
-#?GREETER :50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='ru'
+#?*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'
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/keyboard-variants.conf b/tests/scripts/keyboard-variants.conf
index 46f4fb2cc26e2a334a5d5d9f68cc6d419136f0b3..c2e3ee8d367b872f951a48aaf46186b4a0bee981 100644 (file)
--- a/tests/scripts/keyboard-variants.conf
+++ b/tests/scripts/keyboard-variants.conf
@@ -8,43 +8,42 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-VARIANTS LAYOUT=fr
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  nodeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  sundeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  oss'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  oss_latin9'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  oss_nodeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  oss_sundeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  latin9'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  latin9_nodeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  latin9_sundeadkeys'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  bepo'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  bepo_latin9'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  dvorak'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  mac'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  bre'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  oci'
-#?GREETER :50 LOG-VARIANTS LAYOUT='fr  geo'
+#?*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
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-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 ec0ad5fd7b91a601a928fd435029850d2634b7e9..2f0b90a5cf67b9ad2576974b73eaf09de7357cd2 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -11,26 +11,25 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LANGUAGE USERNAME=have-language
-#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
+#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-language
+#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
index f48f5e3b61b4e35c46a256df69ab897bfa422b6d..ab10ef45d757d467cb311a7441beb3054b1d1788 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -8,26 +8,25 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LANGUAGE USERNAME=have-language
-#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
+#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-language
+#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 85376aa96dcbc23737e7b07688316ba7653dfb75..f78502c9aa31133de9a9729919df1c475fa96ee8 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -8,56 +8,55 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Lock the seat
-#?*SESSION :50 LOCK-SEAT
-#?SESSION :50 LOCK-SEAT
+#?*SESSION-X-50 LOCK-SEAT
+#?SESSION-X-50 LOCK-SEAT
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
-#?GREETER :51 LOCK-HINT
+#?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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index 4bc5527b028c34db291fa1e8b2bf2047e813d099..50019b99dbf0aef0a2f4a36f61f7a446ae1ecd76 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -8,57 +8,56 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Lock the session
-#?*SESSION :50 LOCK-SESSION
-#?SESSION :50 LOCK-SESSION
+#?*SESSION-X-50 LOCK-SESSION
+#?SESSION-X-50 LOCK-SESSION
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts with session user selected
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
-#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1    
-#?GREETER :51 LOCK-HINT
+#?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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 2673a4a9207da3b762f4e3ad371c77eee7bf7e6b..2a4be4f256d4dfca95afd0ab7a3aa109dcf177ea 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -8,27 +8,26 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Attempt to login, but authentication crashes
-#?*GREETER :50 AUTHENTICATE USERNAME=crash-authenticate
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE
+#?*GREETER-X-50 AUTHENTICATE USERNAME=crash-authenticate
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 762f944c4ac0ceb87a8d8418e2205e7e16668dda..26f04a9d11387d62a21848b213ef9a40e5e4e47d 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -11,26 +11,25 @@ allow-guest=false
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER :50 AUTHENTICATE-GUEST
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
+#?*GREETER-X-50 AUTHENTICATE-GUEST
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 dc6f0b570629e3d28878a12be7015ac8bbfd2fa6..eb48a0752c62682732a32b9c2bb060321ffca2eb 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -9,47 +9,46 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER :50 AUTHENTICATE-GUEST
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-50 AUTHENTICATE-GUEST
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # (guest account attempts to start and fails)
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 1dcf3cebf3b71eea7cdc41a7d9dfc5585a1eee02..488c7a9c994d649be8b8602d9dc1653578d5039c 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -8,59 +8,58 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER :50 AUTHENTICATE-GUEST
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-50 AUTHENTICATE-GUEST
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Logout of session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-50 LOGOUT
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 38f600cea864331a93b589412d61686a7c128ac3..d102f3e345a7c9eda0426e9b0780b4788f56ac3e 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -9,26 +9,25 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER :50 AUTHENTICATE-GUEST
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
+#?*GREETER-X-50 AUTHENTICATE-GUEST
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 4e46af103d032496857e408deaf11ed2b631749a..bc27d4737ad72d44289653b21260f0f715a18b02 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -8,37 +8,36 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as guest
-#?*GREETER :50 AUTHENTICATE-GUEST
-#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-50 AUTHENTICATE-GUEST
+#?GREETER-X-50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+#?*GREETER-X-50 START-SESSION
+#?GREETER-X-50 TERMINATE SIGNAL=15
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 8df67e52a8491b36e5894544acadaaaa517bca75..51fa4b0ef2a56a60bd65534c2610dad046ff42ce 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -8,31 +8,30 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER :50 AUTHENTICATE USERNAME=info-prompt
-#?GREETER :50 SHOW-MESSAGE TEXT="Welcome to LightDM"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=info-prompt
+#?GREETER-X-50 SHOW-MESSAGE TEXT="Welcome to LightDM"
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-50 RESPOND TEXT="password"
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 11eae07ef0696c1d9e62cb3814b2a7fbcf73e11a..4c89234638f10c183d2514e65d47a1e15380b5dc 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -8,47 +8,46 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into an account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION SESSION=invalid
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # X server stops, the session is invalid
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 485be17dd01c2057b4230803e1a55b9045713075..e1e54a37fab16be19392b6763e8ec9964739b2f7 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -8,28 +8,27 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as invalid user
-#?*GREETER :50 AUTHENTICATE USERNAME=notauser
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=notauser AUTHENTICATED=FALSE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index db0f1b36c9c20e2937ba8d5e90849611e40a1cf6..34011f5da8d40f9b317786a848e8a7a333c68ad2 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -8,55 +8,54 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-50 LOGOUT
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 1eaf1ddae14acdf0c05f9b41ca3bce6aacfc1860..d3bb18f8c91dc97eb99d7d8bd0ff1b57b4fea09f 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -8,28 +8,27 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log in with a very long username
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 2ae4cd14e2c87de07817a26728f5c5a07c559b2a..9a358c6f60cb6a305dbb450fb87f94fe07ea682a 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -8,28 +8,27 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log in with a very long username
-#?*GREETER :50 AUTHENTICATE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 AUTHENTICATED=FALSE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 dde24b4c48952d3414e34a00b921a0a12f7d8679..dc41cc9fef35ddd4b01c9dfe663f7bf991f06624 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -8,35 +8,34 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as account with a previous session, but let lightdm prompt for a username
-#?*GREETER :50 AUTHENTICATE
-#?GREETER :50 SHOW-PROMPT TEXT="login:"
-#?*GREETER :50 RESPOND TEXT="have-session"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START NAME=alternative USER=have-session
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START NAME=alternative USER=have-session
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index dd83c35e70def5c8db96add11967a60007b6adb7..b9533610e5fe19ac25c05ad433407ff365cf8198 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -8,37 +8,36 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as have-password1, but let lightdm prompt for a username
-#?*GREETER :50 AUTHENTICATE
-#?GREETER :50 SHOW-PROMPT TEXT="login:"
-#?*GREETER :50 RESPOND TEXT="have-password1"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 1baf5eebd2ce6554f60c7ff76d18fc0b972a1d14..ed210ad048bf9a259b41a5a94c934223830e5871 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -8,33 +8,32 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER :50 AUTHENTICATE USERNAME=multi-info-prompt
-#?GREETER :50 SHOW-MESSAGE TEXT="Welcome to LightDM"
-#?GREETER :50 SHOW-MESSAGE TEXT="This is an error"
-#?GREETER :50 SHOW-MESSAGE TEXT="You should have seen three messages"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*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:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-50 RESPOND TEXT="password"
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 ed24986b43895694172375b3ba0d144cd8e4f1f9..58e2a3776f28a741065ebe5e26c72f6a16a5163f 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -8,32 +8,31 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account and see an informational prompt
-#?*GREETER :50 AUTHENTICATE USERNAME=multi-prompt
-#?GREETER :50 SHOW-PROMPT TEXT="Favorite Color:"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=multi-prompt
+#?GREETER-X-50 SHOW-PROMPT TEXT="Favorite Color:"
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Respond with password and check response is correctly handled
-#?*GREETER :50 RESPOND TEXT="blue"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE
+#?*GREETER-X-50 RESPOND TEXT="blue"
+#?*GREETER-X-50 RESPOND TEXT="password"
+#?GREETER-X-50 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 abb3644579ab4d8f84941bc30a119835b1bc12b5..f4689c5bace4b30fd4619d649459a60cf5518dd3 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -8,35 +8,34 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account that requires as password change
-#?*GREETER :50 AUTHENTICATE USERNAME=new-authtok
-#?GREETER :50 SHOW-PROMPT TEXT="Enter new password:"
-#?*GREETER :50 RESPOND TEXT="New password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=new-authtok
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=new-authtok
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 314bed75f8b2a8d881eaaf76e9f22acf78540393..3aa2fe8c4eb644c248b3e5b4d20513cda4cd8b2f 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -8,33 +8,32 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account without a password
-#?*GREETER :50 AUTHENTICATE USERNAME=no-password1
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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 starts
-#?SESSION :50 START USER=no-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=no-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 5010b0384cf00b695c5a37ea7fca35af5b21fa95..23b6bc3fb38cc6f16c784ef834d097dd43bd0e9b 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -8,37 +8,36 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=log-pam
-#?GREETER :50 SHOW-MESSAGE TEXT="pam_authenticate"
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 SHOW-MESSAGE TEXT="pam_acct_mgmt"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=log-pam
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=log-pam
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 92f7240d473033a69d5851a0b849e0ecde1223ca..df91163af207808a861dc50c35cf31ae88e8b7f2 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -8,35 +8,34 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login as have-password1
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION SESSION=alternative
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START NAME=alternative USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START NAME=alternative USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 aaa641e2771a39831ed6e49cb9f1afac82629eab..be88e19edf89efb5946a9d636c557f57f044233a 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -8,33 +8,32 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account with a previously chosen session
-#?*GREETER :50 AUTHENTICATE USERNAME=have-session
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START NAME=alternative USER=have-session
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START NAME=alternative USER=have-session
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 b24a89f87a92c5c673bec0438075367ab8c25e6e..bbef8e19160ce95e89998cb717f5ad9e8bb1d60f 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -8,43 +8,42 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Start remote authentication
-#?*GREETER :50 AUTHENTICATE-REMOTE SESSION=test-remote
+#?*GREETER-X-50 AUTHENTICATE-REMOTE SESSION=test-remote
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Get remote credentials
-#?GREETER :50 SHOW-PROMPT TEXT="remote-login:"
-#?*GREETER :50 RESPOND TEXT="remote-user"
-#?GREETER :50 SHOW-PROMPT TEXT="remote-password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?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
 
 # Session starts
-#?SESSION :50 START USER=guest-.*
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=guest-.*
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 84c8b77ea530b2c521b169484cef4aa9fbea8fbe..63a8e2624037f4230511b6457f24a9028b82fa42 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -8,55 +8,54 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into an account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Crash session
-#?*SESSION :50 CRASH
+#?*SESSION-X-50 CRASH
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 04791ddeafd78dacebc35f2e033993b91536da66..743e580018a4a88c01f73b069be7a15675c3663d 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -8,30 +8,29 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=two-factor
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 SHOW-PROMPT TEXT="OTP:"
-#?*GREETER :50 RESPOND TEXT="otp"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=two-factor AUTHENTICATED=TRUE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 56c1f874789eef762184c4b3c1de4066ef3e4942..ab5387bbd09925ae7f8c57f6edba5fa8da3c18b4 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -8,29 +8,28 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login with invalid password
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="rubbish"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 fb38288306959b94bab09c8b0edaef50e5717223..58b30dc9ad74bc1ff5a8545b57e1cf09b7395a56 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -8,52 +8,51 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # XServer starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Crash X server
-#?*XSERVER :50 CRASH
+#?*XSERVER-50 CRASH
 
 # User session is terminated
-#?SESSION :50 TERMINATE SIGNAL=15
+#?SESSION-X-50 TERMINATE SIGNAL=15
 
 # X server restarts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index ba3120b25f21c1e01468703309591f81631fa166..afa5004c2b265de0e6f4bfac6eefc9ee849fcf34 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -8,35 +8,34 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log into account with a password
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 e79d2e7bf597905a166cfa53c0db097bb5bc9055..b93f6678a158133c9607e2ff1d47eee0e490fb7b 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -14,20 +14,19 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
index 89f71b19078763d90161f1948bce8a28ee372ead..1b431b47fe4e599a0ecc775a7431c87296a0f493 100644 (file)
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -8,23 +8,21 @@ have-config=false
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER :.* START
-#?XSERVER :.* INDICATE-READY
+#?XSERVER-0 START
+#?XSERVER-0 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :.* ACCEPT-CONNECT
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :.* START
-#?XSERVER :.* ACCEPT-CONNECT
-#?GREETER :.* CONNECT-XSERVER
-#?GREETER :.* CONNECT-TO-DAEMON
-#?GREETER :.* CONNECTED-TO-DAEMON
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :.* TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-#?(GREETER :.* TERMINATE SIGNAL=15|XSERVER :.* 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-console-kit.conf b/tests/scripts/no-console-kit.conf
index d778a89a1dea631ce321ccf0d2d000bd864dbdbc..4b56d47fc2f2350473485bf533d349d1625636dc 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -14,20 +14,19 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 645ce21e3d9f6ee1cb933b89bd93bd65457da4e1..a19edc259caa018453d318c3fd80fbf088b64853 100644 (file)
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -8,26 +8,25 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LAYOUT USERNAME=have-password1
-#?GREETER :50 LOG-LAYOUT USERNAME=have-password1 LAYOUT=''
+#?*GREETER-X-50 LOG-LAYOUT USERNAME=have-password1
+#?GREETER-X-50 LOG-LAYOUT USERNAME=have-password1 LAYOUT=''
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf
index b50957c485bfe497463c9161333ede726e36950d..09e94a79b4e8b384cb9a6fc881a21f679a4733df 100644 (file)
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -8,26 +8,25 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-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 :50 LOG-LANGUAGE USERNAME=have-password1
-#?GREETER :50 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE=
+#?*GREETER-X-50 LOG-LANGUAGE USERNAME=have-password1
+#?GREETER-X-50 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE=
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 13dad3c1be898da22763b5f2e7149c3a990c075c..083c11d0adb4dea46a07fbcb1d9af384037a6a79 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -9,39 +9,38 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check file descriptors
-#?*SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS
-#?SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
+#?*SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS
+#?SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 64078dc9c2d73adaa311bbe09e4a974f42d1f47f..173fed620b04544155bac8721294f9dc72ab9e5e 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -11,20 +11,19 @@ autologin-user=log-pam
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=log-pam
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=log-pam
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 f776189fa7cbdde2e3f9540c9b733e65483e1259..be2fd941e5422bd5839bddb385eb44e401a4fa38 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -18,25 +18,24 @@ active=true
 #?PLYMOUTH DEACTIVATE
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # Plymouth quits but keeps image in framebuffer
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 c72adb22554390c7851fc676abd3b7cf07cee41b..99ec3bab271869d618a2fb99b2fb4891015174f9 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -12,26 +12,24 @@ active=true
 #?RUNNER DAEMON-START
 
 # Check if Plymouth is running, then start X server
-# The Plymouth interaction and X server interaction can happen at the same time
-#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY)
-#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY)
-#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY)
-#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY)
-#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY)
+#?PLYMOUTH PING ACTIVE=TRUE
+#?PLYMOUTH HAS-ACTIVE-VT=FALSE
+#?PLYMOUTH QUIT RETAIN-SPLASH=FALSE
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index f45edc89b44759c0f5ce47fbfab587402542b31f..01a911d31f8ecad03dd23ef2b6aaf1cb6a003119 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -8,31 +8,30 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Start authentication
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Restart authentication
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-50 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-50 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 a2ad5771553e3143016f1c3c637170b2cccbd917..07e7a539b5f06e71dce4eb8a593b5cfde94605ad 100644 (file)
--- a/tests/scripts/script-hook-fail-display-setup.conf
+++ b/tests/scripts/script-hook-fail-display-setup.conf
@@ -11,17 +11,16 @@ 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-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK DISPLAY-SETUP
 
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # Cleanup
-# Don't know what order they will terminate
 #?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 ce344c3b815eaed6d190903614e5b9a451ee63b9..08db58772c8a64ab8a494c8340098ccff977bbad 100644 (file)
--- a/tests/scripts/script-hook-fail-greeter-setup.conf
+++ b/tests/scripts/script-hook-fail-greeter-setup.conf
@@ -11,17 +11,16 @@ 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-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK GREETER-SETUP
 
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # Cleanup
-# Don't know what order they will terminate
 #?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 3575342b694aae9a81de19ffcd1232c8860a6738..b306d5f3656ad6518a36f8b6623bd9be5404c0fa 100644 (file)
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -12,25 +12,24 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Setup script fails
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 7a1a34caa55a4e8f4577f1682cb97ec4088c04a0..d505e19f4eefcba45213ca47df42b62aef36a2e0 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -15,51 +15,50 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION :50 LOGOUT
+#?*SESSION-X-50 LOGOUT
 
 # Script hook runs
 #?SCRIPT-HOOK SESSION-CLEANUP
 
 # X server stops
-#?XSERVER :50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Script hooks run
 #?SCRIPT-HOOK DISPLAY-SETUP
 #?SCRIPT-HOOK GREETER-SETUP
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 4723881504e5c5d5f0e0452f77d462d7d4c20eee..08ee967658f768c6f4312e5e328e2bc4d10c007e 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -11,81 +11,80 @@ autologin-user=no-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=no-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=no-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION :50 WRITE-STDERR TEXT=FIRST-SESSION
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=FIRST-SESSION
+#?*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
 
 # Restart session
-#?*SESSION :50 LOGOUT
-#?XSERVER :50 TERMINATE SIGNAL=15
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
-#?*GREETER :50 AUTHENTICATE USERNAME=no-password1
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
-#?SESSION :50 START USER=no-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?*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
 
 # Write to stderr and check it shows up in the log
-#?*SESSION :50 WRITE-STDERR TEXT=SECOND-SESSION
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=SECOND-SESSION
+#?*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
 
 # Check first log is backed up
-#?*SESSION :50 READ FILE=.xsession-errors.old
-#?SESSION :50 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION
+#?*SESSION-X-50 READ FILE=.xsession-errors.old
+#?SESSION-X-50 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION
 
 # Restart session
-#?*SESSION :50 LOGOUT
-#?XSERVER :50 TERMINATE SIGNAL=15
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
-#?*GREETER :50 AUTHENTICATE USERNAME=no-password1
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
-#?SESSION :50 START USER=no-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?*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
 
 # Write to stderr and check it shows up in the log
-#?*SESSION :50 WRITE-STDERR TEXT=THIRD-SESSION
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=THIRD-SESSION
+#?*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
 
 # Check second log is backed up
-#?*SESSION :50 READ FILE=.xsession-errors.old
-#?SESSION :50 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION
+#?*SESSION-X-50 READ FILE=.xsession-errors.old
+#?SESSION-X-50 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 f7800785aa313f6c9577a60e3d88a1e22e14b171..eb50c888da8f34bc65cf05c79cc5aafef6fce033 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -11,26 +11,25 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Write to stderr and check all text ends up in log
-#?*SESSION :50 WRITE-STDERR TEXT=MULTI-
-#?*SESSION :50 WRITE-STDERR TEXT=WRITE
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=MULTI-WRITE
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf
index d0caa9e09fcc827820ba6d49c9bc52ec45e1d3b0..9c14e0edda117bed65d83284531d64284a30c894 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -11,25 +11,24 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Write to stderr and check it shows up in the log
-#?*SESSION :50 WRITE-STDERR TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS
+#?*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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf
index 59b95e890a38c23267493a573e5f7bf663d87eb0..687d5102678e748a06304a31508bbf80c326bb8a 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -11,25 +11,24 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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 :50 WRITE-STDOUT TEXT=YOU-SHOULD-NOT-SEE-THIS
-#?*SESSION :50 READ FILE=.xsession-errors
-#?SESSION :50 READ FILE=.xsession-errors TEXT=
+#?*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=
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 a61046a402c060e43377abef751f50c3fff03242..ce8df746bc518821fb2d635ac90b3d5e9e10e2fa 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -8,55 +8,54 @@ minimum-display-number=50
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Login
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
+#?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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 b096c51b398acb02fde13dcfc06b9fa6c99db175..f5bc4fa3e8553083b9d6eee0ada7e4f89df90d9c 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -12,35 +12,35 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Default session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Switch to guest
 #?*SWITCH-TO-GUEST
 #?RUNNER SWITCH-TO-GUEST
 
 # New X server starts
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Guest account created
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION :51 START USER=guest-.*
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?SESSION-X-51 START USER=guest-.*
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
 
 # Switch again, should not do anything as guest already running
 #?*SWITCH-TO-GUEST
@@ -49,10 +49,9 @@ autologin-user=have-password1
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 525618b868fc3f5b9981e3c7ea895ee242a7b2e1..5a92595b989428fbe51eac30681697f80ce86696 100644 (file)
--- a/tests/scripts/switch-to-user-existing-session.conf
+++ b/tests/scripts/switch-to-user-existing-session.conf
@@ -12,16 +12,16 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Switch to account with a password
 #?*SWITCH-TO-USER USERNAME=have-password1
@@ -32,7 +32,6 @@ autologin-user=have-password1
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15)
-#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15)
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-50 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 19088e6d66fd15c5514b07d0b1884729dc7dca86..661accc662b63d3734866a17e06c131c612795db 100644 (file)
--- a/tests/scripts/switch-to-user-logout.conf
+++ b/tests/scripts/switch-to-user-logout.conf
@@ -12,58 +12,57 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION :51 START USER=no-password1
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?SESSION-X-51 START USER=no-password1
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
 
 # Logout session
-#?*SESSION :51 LOGOUT
+#?*SESSION-X-51 LOGOUT
 
 # X server stops
-#?XSERVER :51 TERMINATE SIGNAL=15
+#?XSERVER-51 TERMINATE SIGNAL=15
 
 # X server starts for greeter
-#?XSERVER :51 START
-#?XSERVER :51 INDICATE-READY
+#?XSERVER-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
+#?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
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 f37863008267bb900ae3466cbd242cc7babcbc80..8f97b0dba2531c1ee8db338dddf51c5b39f804a4 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -12,38 +12,37 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION :51 START USER=no-password1
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?SESSION-X-51 START USER=no-password1
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?SESSION-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 cc726b44c8ffe952d19b44f8e32bac3139ee1f43..b120bb5870da1168306a08ca7a68a67dda78d64f 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -12,45 +12,44 @@ autologin-user=no-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=no-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=no-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER :51 START
-#?XSERVER :51 ACCEPT-CONNECT
-#?GREETER :51 CONNECT-XSERVER
-#?GREETER :51 CONNECT-TO-DAEMON
-#?GREETER :51 CONNECTED-TO-DAEMON
+#?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
 
 # Requested user is automatically selected
-#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1
-#?*GREETER :51 AUTHENTICATE USERNAME=have-password1
-#?GREETER :51 SHOW-PROMPT TEXT="Password:"
+#?GREETER-X-51 SELECT-USER-HINT USERNAME=have-password1
+#?*GREETER-X-51 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-51 SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
+#?GREETER-X-51 TERMINATE SIGNAL=15
+#?XSERVER-51 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 e4ac78f12be8d373a098761fd00b3e5438a1df95..922f562928387cf5ab5e49c139da43a5e47c08b2 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -12,56 +12,55 @@ autologin-user=have-password1
 #?*WAIT
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-51 START
+#?XSERVER-51 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :51 ACCEPT-CONNECT
+#?XSERVER-51 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION :51 START USER=no-password1
-#?XSERVER :51 ACCEPT-CONNECT
-#?SESSION :51 CONNECT-XSERVER
+#?SESSION-X-51 START USER=no-password1
+#?XSERVER-51 ACCEPT-CONNECT
+#?SESSION-X-51 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-52 START
+#?XSERVER-52 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :52 ACCEPT-CONNECT
+#?XSERVER-52 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION :52 START USER=no-password2
-#?XSERVER :52 ACCEPT-CONNECT
-#?SESSION :52 CONNECT-XSERVER
+#?SESSION-X-52 START USER=no-password2
+#?XSERVER-52 ACCEPT-CONNECT
+#?SESSION-X-52 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15)
+#?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
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index 17f4de5466b962fddc0ffaded30c49cdde0f249f..bcc2735e246244bd0bc970d193781ad53f62fa21 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -12,24 +12,23 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check where the X authority is
-#?*SESSION :50 READ-ENV NAME=XAUTHORITY
-#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority
+#?*SESSION-X-50 READ-ENV NAME=XAUTHORITY
+#?SESSION-X-50 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 f7e9c20e8da12d284cf174a5122226aae2361c38..01b049ecbd8c29f93769e8ec433289a17fbf5f9d 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -11,24 +11,23 @@ autologin-user=change-user-invalid
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # (fails to start session for invalid user)
 
 # Greeter starts
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-50 START
+#?XSERVER-50 ACCEPT-CONNECT
+#?GREETER-X-50 CONNECT-XSERVER
+#?GREETER-X-50 CONNECT-TO-DAEMON
+#?GREETER-X-50 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?GREETER-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 9f03b008cbc31dbf59a0e0e270ec4931a3561f11..eff630f7d7b4d539b99b98e65234e7ec71782b39 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -11,20 +11,19 @@ autologin-user=change-user1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=change-user2
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=change-user2
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf
index 185ff98112843c86e998cdddbdaac92a748e8fa3..07afbe214f44d5d1b0da620e912b92e3cfbf9419 100644 (file)
--- a/tests/scripts/util-path.conf
+++ b/tests/scripts/util-path.conf
@@ -11,25 +11,24 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check utility path is there
-#?*SESSION :50 READ-ENV NAME=PATH
+#?*SESSION-X-50 READ-ENV NAME=PATH
 # FIXME: This is a really crap regex and the path could be overridden in the configure stage
-#?SESSION :50 READ-ENV NAME=PATH VALUE=.*/lightdm:.*
+#?SESSION-X-50 READ-ENV NAME=PATH VALUE=.*/lightdm:.*
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index 0c6199e98e8d106a2e4849477a21902c7d90acf1..7e52fdc1de3b0a84fde97f6760c4973d7ba7958f 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -19,39 +19,39 @@ port=9999
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8
+#?XSERVER-50 START GEOMETRY=1024x768 DEPTH=8
 
 # Negotiate with Xvnc
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 INDICATE-READY
 
 # LightDM and vnc-client connect to X server
-#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
-#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
+#?XSERVER-50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?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
 
 # Log in
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 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 d4daa68950cf7c611249706c6ec4528f77a81097..36e673af56638a7e65287bad0018f38585f893a1 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -19,44 +19,44 @@ port=9999
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8
+#?XSERVER-50 START GEOMETRY=1024x768 DEPTH=8
 
 # Negotiate with Xvnc
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 INDICATE-READY
 
-#?XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
+#?XSERVER-50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?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
 
 # Log in
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*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
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check file descriptors
-#?*SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS
-#?SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
+#?*SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS
+#?SESSION-X-50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
 
 # Clean up
 #?*STOP-DAEMON
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index f07890bb0534511aea7edc55b329cc89863b7751..8507cffb34030eb8c97ebc3046052e17b6cfc93d 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -11,24 +11,23 @@ autologin-user=have-password1
 #?RUNNER DAEMON-START
 
 # X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 CONNECT-XSERVER
 
 # Check where the X authority is
-#?*SESSION :50 READ-ENV NAME=XAUTHORITY
-#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority
+#?*SESSION-X-50 READ-ENV NAME=XAUTHORITY
+#?SESSION-X-50 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority
 
 # Cleanup
 #?*STOP-DAEMON
-# Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf
index 3167d73afbc4bef0c66b23a9eff0c3d6fe2be02a..3ae88bc693e19527f7f6bc7cd195070454ce1de3 100644 (file)
--- a/tests/scripts/xdmcp-login.conf
+++ b/tests/scripts/xdmcp-login.conf
@@ -15,39 +15,39 @@ port=9999
 
 # Start a remote X server to log in with XDMCP
 #?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
-#?XSERVER :98 START
-#?XSERVER :98 SEND-QUERY
+#?XSERVER-98 START
+#?XSERVER-98 SEND-QUERY
 
 # Negotiate with daemon
-#?XSERVER :98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?XSERVER :98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER :98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?XSERVER :98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS"
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
+#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
+#?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 TCP-ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER 127.0.0.1:98 START
-#?XSERVER :98 TCP-ACCEPT-CONNECT
-#?GREETER 127.0.0.1:98 CONNECT-XSERVER
-#?GREETER 127.0.0.1:98 CONNECT-TO-DAEMON
-#?GREETER 127.0.0.1:98 CONNECTED-TO-DAEMON
+#?GREETER-X-127.0.0.1:98 START
+#?XSERVER-98 TCP-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
 
 # Log in
-#?*GREETER 127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
-#?GREETER 127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
-#?*GREETER 127.0.0.1:98 RESPOND TEXT="password"
-#?GREETER 127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER 127.0.0.1:98 START-SESSION
-#?GREETER 127.0.0.1:98 TERMINATE SIGNAL=15
+#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password"
+#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-127.0.0.1:98 START-SESSION
+#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION 127.0.0.1:98 START USER=have-password1
-#?XSERVER :98 TCP-ACCEPT-CONNECT
-#?SESSION 127.0.0.1:98 CONNECT-XSERVER
+#?SESSION-X-127.0.0.1:98 START USER=have-password1
+#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?SESSION 127.0.0.1:98 TERMINATE SIGNAL=15
+#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xdmcp-open-file-descriptors.conf b/tests/scripts/xdmcp-open-file-descriptors.conf
index 779b6be9d8e1a21ce567c9e73354e4e341e7e1b9..06da246e26d4682b4475021249e27b4f8b05fe6e 100644 (file)
--- a/tests/scripts/xdmcp-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-open-file-descriptors.conf
@@ -15,43 +15,43 @@ port=9999
 
 # Start a remote X server to log in with XDMCP
 #?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
-#?XSERVER :98 START
-#?XSERVER :98 SEND-QUERY
+#?XSERVER-98 START
+#?XSERVER-98 SEND-QUERY
 
 # Negotiate with daemon
-#?XSERVER :98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?XSERVER :98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER :98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?XSERVER :98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS"
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
+#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
+#?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 TCP-ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER 127.0.0.1:98 START
-#?XSERVER :98 TCP-ACCEPT-CONNECT
-#?GREETER 127.0.0.1:98 CONNECT-XSERVER
-#?GREETER 127.0.0.1:98 CONNECT-TO-DAEMON
-#?GREETER 127.0.0.1:98 CONNECTED-TO-DAEMON
+#?GREETER-X-127.0.0.1:98 START
+#?XSERVER-98 TCP-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
 
 # Log in
-#?*GREETER 127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
-#?GREETER 127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
-#?*GREETER 127.0.0.1:98 RESPOND TEXT="password"
-#?GREETER 127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER 127.0.0.1:98 START-SESSION
-#?GREETER 127.0.0.1:98 TERMINATE SIGNAL=15
+#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password"
+#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-127.0.0.1:98 START-SESSION
+#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION 127.0.0.1:98 START USER=have-password1
-#?XSERVER :98 TCP-ACCEPT-CONNECT
-#?SESSION 127.0.0.1:98 CONNECT-XSERVER
+#?SESSION-X-127.0.0.1:98 START USER=have-password1
+#?XSERVER-98 TCP-ACCEPT-CONNECT
+#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Check file descriptors
-#?*SESSION 127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS
-#?SESSION 127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
+#?*SESSION-X-127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS
+#?SESSION-X-127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS FDS=
 
 # Clean up
 #?*STOP-DAEMON
-#?SESSION 127.0.0.1:98 TERMINATE SIGNAL=15
+#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf
index 883f60a6f8bf8b878d0f846b07e404f137184c3c..0e7fe044606010e035a4446a9d17e24374af8d7e 100644 (file)
--- a/tests/scripts/xserver-fail-start.conf
+++ b/tests/scripts/xserver-fail-start.conf
@@ -10,8 +10,8 @@ return-value=1
 #?RUNNER DAEMON-START
 
 # X server fails to start
-#?XSERVER :50 START
-#?XSERVER :50 EXIT CODE=1
+#?XSERVER-50 START
+#?XSERVER-50 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 d96ebbcebffe4b9d8de2b507af6d4d3149f64fec..d83c5c4b9bdc40b62a8577bfc5efcfd27dae71f7 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -73,14 +73,12 @@ test_gobject_greeter_CFLAGS = \
        -I$(top_srcdir)/liblightdm-gobject \
        $(WARN_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GIO_UNIX_CFLAGS) \
-       $(XCB_CFLAGS)
+       $(GIO_UNIX_CFLAGS)
 test_gobject_greeter_LDADD = \
        -L$(top_builddir)/liblightdm-gobject \
        -llightdm-gobject-1 \
        $(GLIB_LIBS) \
-       $(GIO_UNIX_LIBS) \
-       $(XCB_LIBS)
+       $(GIO_UNIX_LIBS)
 
 guest_account_SOURCES = guest-account.c status.c status.h
 guest_account_CFLAGS = \
@@ -111,8 +109,7 @@ nodist_test_qt4_greeter_SOURCES = test-qt4-greeter_moc4.cpp
 nodist_test_qt5_greeter_SOURCES = test-qt5-greeter_moc5.cpp
 common_qt_cflags = \
        $(GLIB_CFLAGS) \
-       $(GIO_UNIX_CFLAGS) \
-       $(XCB_CFLAGS)
+       $(GIO_UNIX_CFLAGS)
 test_qt4_greeter_CFLAGS = $(common_qt_cflags)
 test_qt5_greeter_CFLAGS = $(common_qt_cflags)
 common_qt_cxxflags = \
@@ -129,8 +126,7 @@ test_qt5_greeter_CXXFLAGS = \
 common_qt_ldadd = \
        -L$(top_builddir)/liblightdm-qt \
        $(GLIB_LIBS) \
-       $(GIO_UNIX_LIBS) \
-       $(XCB_LIBS)
+       $(GIO_UNIX_LIBS)
 test_qt4_greeter_LDADD = \
        $(common_qt_ldadd) \
        -llightdm-qt-2 \
@@ -144,12 +140,10 @@ test_session_SOURCES = test-session.c status.c status.h
 test_session_CFLAGS = \
        $(WARN_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GIO_UNIX_CFLAGS) \
-       $(XCB_CFLAGS)
+       $(GIO_UNIX_CFLAGS)
 test_session_LDADD = \
        $(GLIB_LIBS) \
-       $(GIO_UNIX_LIBS) \
-       $(XCB_LIBS)
+       $(GIO_UNIX_LIBS)
 
 initctl_SOURCES = initctl.c
 initctl_CFLAGS = \

diff --git a/tests/src/X.c b/tests/src/X.c
index 5318afdd9a58af4527681e279c2f813a02ffa4c3..1fd3e57787034b268c7b4b9ab68a19d0e18dbcbe 100644 (file)
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -62,7 +62,7 @@ indicate_ready ()
     handler = signal (SIGUSR1, SIG_IGN);
     if (handler == SIG_IGN)
     {
-        status_notify ("XSERVER :%d INDICATE-READY", display_number);
+        status_notify ("XSERVER-%d INDICATE-READY", display_number);
         kill (getppid (), SIGUSR1);
     }
     signal (SIGUSR1, handler);
@@ -73,12 +73,12 @@ signal_cb (int signum)
 {
     if (signum == SIGHUP)
     {
-        status_notify ("XSERVER :%d DISCONNECT-CLIENTS", display_number);
+        status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number);
         indicate_ready ();
     }
     else
     {
-        status_notify ("XSERVER :%d TERMINATE SIGNAL=%d", display_number, signum);
+        status_notify ("XSERVER-%d TERMINATE SIGNAL=%d", display_number, signum);
         quit (EXIT_SUCCESS);
     }
 }
@@ -90,7 +90,7 @@ xdmcp_query_cb (XDMCPClient *client)
 
     if (!notified_query)
     {
-        status_notify ("XSERVER :%d SEND-QUERY", display_number);
+        status_notify ("XSERVER-%d SEND-QUERY", display_number);
         notified_query = TRUE;
     }
 }
@@ -101,9 +101,9 @@ xdmcp_willing_cb (XDMCPClient *client, XDMCPWilling *message)
     gchar **authorization_names;
     GInetAddress *addresses[2];
 
-    status_notify ("XSERVER :%d GOT-WILLING AUTHENTICATION-NAME=\"%s\" HOSTNAME=\"%s\" STATUS=\"%s\"", display_number, message->authentication_name, message->hostname, message->status);
+    status_notify ("XSERVER-%d GOT-WILLING AUTHENTICATION-NAME=\"%s\" HOSTNAME=\"%s\" STATUS=\"%s\"", display_number, message->authentication_name, message->hostname, message->status);
 
-    status_notify ("XSERVER :%d SEND-REQUEST DISPLAY-NUMBER=%d AUTHORIZATION-NAME=\"%s\" MFID=\"%s\"", display_number, display_number, "MIT-MAGIC-COOKIE-1", "TEST XSERVER");
+    status_notify ("XSERVER-%d SEND-REQUEST DISPLAY-NUMBER=%d AUTHORIZATION-NAME=\"%s\" MFID=\"%s\"", display_number, display_number, "MIT-MAGIC-COOKIE-1", "TEST XSERVER");
 
     authorization_names = g_strsplit ("MIT-MAGIC-COOKIE-1", " ", -1);
     addresses[0] = xdmcp_client_get_local_address (client);
@@ -118,7 +118,7 @@ xdmcp_willing_cb (XDMCPClient *client, XDMCPWilling *message)
 static void
 xdmcp_accept_cb (XDMCPClient *client, XDMCPAccept *message)
 {
-    status_notify ("XSERVER :%d GOT-ACCEPT SESSION-ID=%d AUTHENTICATION-NAME=\"%s\" AUTHORIZATION-NAME=\"%s\"", display_number, message->session_id, message->authentication_name, message->authorization_name);
+    status_notify ("XSERVER-%d GOT-ACCEPT SESSION-ID=%d AUTHENTICATION-NAME=\"%s\" AUTHORIZATION-NAME=\"%s\"", display_number, message->session_id, message->authentication_name, message->authorization_name);
 
     /* Ignore if haven't picked a valid authorization */
     if (strcmp (message->authorization_name, "MIT-MAGIC-COOKIE-1") != 0)
@@ -129,20 +129,20 @@ xdmcp_accept_cb (XDMCPClient *client, XDMCPAccept *message)
     xdmcp_cookie = g_malloc (message->authorization_data_length);
     memcpy (xdmcp_cookie, message->authorization_data, message->authorization_data_length);
 
-    status_notify ("XSERVER :%d SEND-MANAGE SESSION-ID=%d DISPLAY-NUMBER=%d DISPLAY-CLASS=\"%s\"", display_number, message->session_id, display_number, "DISPLAY CLASS");
+    status_notify ("XSERVER-%d SEND-MANAGE SESSION-ID=%d DISPLAY-NUMBER=%d DISPLAY-CLASS=\"%s\"", display_number, message->session_id, display_number, "DISPLAY CLASS");
     xdmcp_client_send_manage (client, message->session_id, display_number, "DISPLAY CLASS");
 }
 
 static void
 xdmcp_decline_cb (XDMCPClient *client, XDMCPDecline *message)
 {
-    status_notify ("XSERVER :%d GOT-DECLINE STATUS=\"%s\" AUTHENTICATION-NAME=\"%s\"", display_number, message->status, message->authentication_name);  
+    status_notify ("XSERVER-%d GOT-DECLINE STATUS=\"%s\" AUTHENTICATION-NAME=\"%s\"", display_number, message->status, message->authentication_name);  
 }
 
 static void
 xdmcp_failed_cb (XDMCPClient *client, XDMCPFailed *message)
 {
-    status_notify ("XSERVER :%d GOT-FAILED SESSION-ID=%d STATUS=\"%s\"", display_number, message->session_id, message->status);
+    status_notify ("XSERVER-%d GOT-FAILED SESSION-ID=%d STATUS=\"%s\"", display_number, message->session_id, message->status);
 }
 
 static void
@@ -151,9 +151,9 @@ x_client_connect_cb (XClient *client, XConnect *message)
     gchar *auth_error = NULL;
 
     if (x_client_get_address (client))
-        status_notify ("XSERVER :%d TCP-ACCEPT-CONNECT", display_number);
+        status_notify ("XSERVER-%d TCP-ACCEPT-CONNECT", display_number);
     else
-        status_notify ("XSERVER :%d ACCEPT-CONNECT", display_number);
+        status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
 
     if (xdmcp_client)
     {
@@ -239,7 +239,7 @@ request_cb (const gchar *request)
         return;
     }
 
-    r = g_strdup_printf ("XSERVER :%d CRASH", display_number);
+    r = g_strdup_printf ("XSERVER-%d CRASH", display_number);
     if (strcmp (request, r) == 0)
     {
         cleanup ();
@@ -258,6 +258,7 @@ main (int argc, char **argv)
     gboolean do_xdmcp = FALSE;
     guint xdmcp_port = 0;
     gchar *xdmcp_host = NULL;
+    gchar *lock_filename;
     int lock_file;
 
     signal (SIGINT, signal_cb);
@@ -351,7 +352,7 @@ main (int argc, char **argv)
     /* 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);
+    status_notify ("XSERVER-%d START", display_number);
 
     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);
@@ -359,11 +360,13 @@ main (int argc, char **argv)
     if (g_key_file_has_key (config, "test-xserver-config", "return-value", NULL))
     {
         int return_value = g_key_file_get_integer (config, "test-xserver-config", "return-value", NULL);
-        status_notify ("XSERVER :%d EXIT CODE=%d", display_number, return_value);
+        status_notify ("XSERVER-%d EXIT CODE=%d", display_number, return_value);
         return return_value;
     }
 
-    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)
     {
@@ -380,14 +383,22 @@ main (int argc, char **argv)
             proc_filename = g_strdup_printf ("/proc/%d", pid);
             if (!g_file_test (proc_filename, G_FILE_TEST_EXISTS))
             {
+                gchar *socket_dir;
+                gchar *socket_filename;
                 gchar *socket_path;
 
-                socket_path = g_strdup_printf ("/tmp/.X11-unix/X%d", display_number);
+                socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL);
+                g_mkdir_with_parents (socket_dir, 0755);                
+
+                socket_filename = g_strdup_printf ("X%d", display_number);
+                socket_path = g_build_filename (socket_dir, socket_filename, NULL);
 
                 g_printerr ("Breaking lock on non-existant process %d\n", pid);
                 unlink (lock_path);
                 unlink (socket_path);
 
+                g_free (socket_dir);
+                g_free (socket_filename);
                 g_free (socket_path);
             }
             g_free (proc_filename);

diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c
index e684951b04c0d20eab36f7413db39492c3fd5533..889e7f4ede600eb37227c9e8816de936c9ced0ab 100644 (file)
--- a/tests/src/Xvnc.c
+++ b/tests/src/Xvnc.c
@@ -35,7 +35,7 @@ indicate_ready ()
     handler = signal (SIGUSR1, SIG_IGN);
     if (handler == SIG_IGN)
     {
-        status_notify ("XSERVER :%d INDICATE-READY", display_number);
+        status_notify ("XSERVER-%d INDICATE-READY", display_number);
         kill (getppid (), SIGUSR1);
     }
     signal (SIGUSR1, handler);
@@ -62,12 +62,12 @@ signal_cb (int signum)
 {
     if (signum == SIGHUP)
     {
-        status_notify ("XSERVER :%d DISCONNECT-CLIENTS", display_number);
+        status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number);
         indicate_ready ();
     }
     else
     {
-        status_notify ("XSERVER :%d TERMINATE SIGNAL=%d", display_number, signum);
+        status_notify ("XSERVER-%d TERMINATE SIGNAL=%d", display_number, signum);
         quit (EXIT_SUCCESS);
     }
 }
@@ -78,9 +78,9 @@ x_client_connect_cb (XClient *client, XConnect *message)
     gchar *auth_error = NULL;
 
     if (x_client_get_address (client))
-        status_notify ("XSERVER :%d TCP-ACCEPT-CONNECT", display_number);
+        status_notify ("XSERVER-%d TCP-ACCEPT-CONNECT", display_number);
     else
-        status_notify ("XSERVER :%d ACCEPT-CONNECT", display_number);
+        status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number);
 
     if (auth_path)
     {
@@ -151,7 +151,7 @@ vnc_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data)
         buffer[n_read] = '\0';
         if (g_str_has_suffix (buffer, "\n"))
             buffer[n_read-1] = '\0';
-        status_notify ("XSERVER :%d VNC-CLIENT-CONNECT VERSION=\"%s\"", display_number, buffer);
+        status_notify ("XSERVER-%d VNC-CLIENT-CONNECT VERSION=\"%s\"", display_number, buffer);
     }
   
     return TRUE;
@@ -176,6 +176,7 @@ main (int argc, char **argv)
     gboolean use_inetd = FALSE;
     gchar *geometry = g_strdup ("640x480");
     gint depth = 8;
+    gchar *lock_filename;
     int lock_file;
     int i;
 
@@ -248,7 +249,7 @@ main (int argc, char **argv)
     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", display_number, geometry, depth);
+    status_notify ("XSERVER-%d START GEOMETRY=%s DEPTH=%d", display_number, geometry, depth);
 
     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);
@@ -267,7 +268,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 5c20ddcea242abc8bdd60ac8ab0e2a751970155f..c7c0bdbb92d58bf62d3e0351fe6a9169e53d14d2 100644 (file)
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -211,6 +211,22 @@ open64 (const char *pathname, int flags, ...)
     return open_wrapper ("open64", pathname, flags, mode);
 }
 
+int
+access (const char *pathname, int mode)
+{
+    int (*_access) (const char *pathname, int mode);
+    gchar *new_path = NULL;
+    int ret;
+
+    _access = (int (*)(const char *pathname, int mode)) dlsym (RTLD_NEXT, "access");
+
+    new_path = redirect_path (pathname);
+    ret = _access (new_path, mode);
+    g_free (new_path);
+
+    return ret;
+}
+
 int
 ioctl (int d, int request, void *data)
 {

diff --git a/tests/src/status.c b/tests/src/status.c
index cc9b46a726e55f23f4e2ff9748939bd5898371cf..6ca6ce42a86d44d89e409b8bfed51132a5bb69a5 100644 (file)
--- a/tests/src/status.c
+++ b/tests/src/status.c
@@ -96,11 +96,6 @@ status_notify (const gchar *format, ...)
         if (error)
             g_printerr ("Failed to write to status socket: %s\n", error->message);
         g_clear_error (&error);
-        /* We sync filesystem here, to guarantee that statuses sent from
-           multiple process (e.g. greeter and X) are all ordered correctly.
-           Without this, there is a race that manifests occasionally between
-           close status_notify calls.  fsync does not seem to do the trick. */
-        sync ();
     }
     else
         g_printerr ("%s\n", status);

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 6597b92ef50b9a774306c0b91bfe0a26a95b9dd9..4bfd44716e3f26c81e623282ea2e226d9f751d27 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -3,11 +3,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <xcb/xcb.h>
 #include <lightdm.h>
 
 #include "status.h"
 
+static gchar *greeter_id;
 static GMainLoop *loop;
 static LightDMGreeter *greeter;
 static xcb_connection_t *connection = NULL;
@@ -16,39 +16,39 @@ static GKeyFile *config;
 static void
 show_message_cb (LightDMGreeter *greeter, const gchar *text, LightDMMessageType type)
 {
-    status_notify ("GREETER %s SHOW-MESSAGE TEXT=\"%s\"", getenv ("DISPLAY"), text);
+    status_notify ("%s SHOW-MESSAGE TEXT=\"%s\"", greeter_id, text);
 }
 
 static void
 show_prompt_cb (LightDMGreeter *greeter, const gchar *text, LightDMPromptType type)
 {
-    status_notify ("GREETER %s SHOW-PROMPT TEXT=\"%s\"", getenv ("DISPLAY"), text);
+    status_notify ("%s SHOW-PROMPT TEXT=\"%s\"", greeter_id, text);
 }
 
 static void
 authentication_complete_cb (LightDMGreeter *greeter)
 {
     if (lightdm_greeter_get_authentication_user (greeter))
-        status_notify ("GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s",
-                       getenv ("DISPLAY"),
+        status_notify ("%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s",
+                       greeter_id,
                        lightdm_greeter_get_authentication_user (greeter),
                        lightdm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE");
     else
-        status_notify ("GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s",
-                       getenv ("DISPLAY"),
+        status_notify ("%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s",
+                       greeter_id,
                        lightdm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE");
 }
 
 static void
 autologin_timer_expired_cb (LightDMGreeter *greeter)
 {
-    status_notify ("GREETER %s AUTOLOGIN-TIMER-EXPIRED", getenv ("DISPLAY"));
+    status_notify ("%s AUTOLOGIN-TIMER-EXPIRED", greeter_id);
 }
 
 static void
 signal_cb (int signum)
 {
-    status_notify ("GREETER %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum);
+    status_notify ("%s TERMINATE SIGNAL=%d", greeter_id, signum);
     exit (EXIT_SUCCESS);
 }
 
@@ -63,32 +63,32 @@ request_cb (const gchar *request)
         return;
     }
   
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE", greeter_id);
     if (strcmp (request, r) == 0)
         lightdm_greeter_authenticate (greeter, NULL);
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE USERNAME=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE USERNAME=", greeter_id);
     if (g_str_has_prefix (request, r))
         lightdm_greeter_authenticate (greeter, request + strlen (r));
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-GUEST", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-GUEST", greeter_id);
     if (strcmp (request, r) == 0)
         lightdm_greeter_authenticate_as_guest (greeter);
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-AUTOLOGIN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-AUTOLOGIN", greeter_id);
     if (strcmp (request, r) == 0)
         lightdm_greeter_authenticate_autologin (greeter);
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-REMOTE SESSION=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-REMOTE SESSION=", greeter_id);
     if (g_str_has_prefix (request, r))
         lightdm_greeter_authenticate_remote (greeter, request + strlen (r), NULL);
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s RESPOND TEXT=\"", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s RESPOND TEXT=\"", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         gchar *text = g_strdup (request + strlen (r));
@@ -98,31 +98,31 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s START-SESSION", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s START-SESSION", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!lightdm_greeter_start_session_sync (greeter, NULL, NULL))
-            status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); 
+            status_notify ("%s SESSION-FAILED", greeter_id); 
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s START-SESSION SESSION=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s START-SESSION SESSION=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         if (!lightdm_greeter_start_session_sync (greeter, request + strlen (r), NULL))
-            status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); 
+            status_notify ("%s SESSION-FAILED", greeter_id); 
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s LOG-LAYOUT", getenv ("DISPLAY"));
+    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 ("GREETER %s LOG-LAYOUT LAYOUT='%s'", getenv ("DISPLAY"), layout ? layout : "");
+        status_notify ("%s LOG-LAYOUT LAYOUT='%s'", greeter_id, layout ? layout : "");
     }
 
-    r = g_strdup_printf ("GREETER %s LOG-LAYOUT USERNAME=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOG-LAYOUT USERNAME=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         LightDMUser *user;
@@ -132,11 +132,11 @@ request_cb (const gchar *request)
         user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
         layout = lightdm_user_get_layout (user);
 
-        status_notify ("GREETER %s LOG-LAYOUT USERNAME=%s LAYOUT='%s'", getenv ("DISPLAY"), username, layout ? layout : "");
+        status_notify ("%s LOG-LAYOUT USERNAME=%s LAYOUT='%s'", greeter_id, username, layout ? layout : "");
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s LOG-LAYOUTS USERNAME=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOG-LAYOUTS USERNAME=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         LightDMUser *user;
@@ -149,11 +149,11 @@ request_cb (const gchar *request)
         layouts = lightdm_user_get_layouts (user);
 
         for (i = 0; layouts[i]; i++)
-            status_notify ("GREETER %s LOG-LAYOUTS USERNAME=%s LAYOUT='%s'", getenv ("DISPLAY"), username, layouts[i]);
+            status_notify ("%s LOG-LAYOUTS USERNAME=%s LAYOUT='%s'", greeter_id, username, layouts[i]);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s LOG-VARIANTS LAYOUT=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOG-VARIANTS LAYOUT=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         GList *layouts, *iter;
@@ -171,12 +171,12 @@ request_cb (const gchar *request)
             name = lightdm_layout_get_name (layout);
 
             if (g_str_has_prefix (name, layout_prefix))
-                status_notify ("GREETER %s LOG-VARIANTS LAYOUT='%s'", getenv ("DISPLAY"), name);
+                status_notify ("%s LOG-VARIANTS LAYOUT='%s'", greeter_id, name);
         }
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s LOG-LANGUAGE USERNAME=", getenv ("DISPLAY"));  
+    r = g_strdup_printf ("%s LOG-LANGUAGE USERNAME=", greeter_id);  
     if (g_str_has_prefix (request, r))
     {
         LightDMUser *user;
@@ -186,7 +186,7 @@ request_cb (const gchar *request)
         user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
         language = lightdm_user_get_language (user);
 
-        status_notify ("GREETER %s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s", getenv ("DISPLAY"), username, language ? language : "");
+        status_notify ("%s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s", greeter_id, username, language ? language : "");
     }
     g_free (r);
 }
@@ -194,6 +194,8 @@ request_cb (const gchar *request)
 int
 main (int argc, char **argv)
 {
+    gchar *display;
+
     signal (SIGINT, signal_cb);
     signal (SIGTERM, signal_cb);
 
@@ -201,11 +203,19 @@ main (int argc, char **argv)
     g_type_init ();
 #endif
 
+    display = getenv ("DISPLAY");
+    if (display == NULL)
+        greeter_id = g_strdup ("GREETER-?");
+    else if (display[0] == ':')
+        greeter_id = g_strdup_printf ("GREETER-X-%s", display + 1);
+    else
+        greeter_id = g_strdup_printf ("GREETER-X-%s", display);
+
     loop = g_main_loop_new (NULL, FALSE);
 
     status_connect (request_cb);
 
-    status_notify ("GREETER %s START", getenv ("DISPLAY"));
+    status_notify ("%s START", greeter_id);
 
     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);
@@ -213,7 +223,7 @@ main (int argc, char **argv)
     if (g_key_file_has_key (config, "test-greeter-config", "return-value", NULL))
     {
         int return_value = g_key_file_get_integer (config, "test-greeter-config", "return-value", NULL);
-        status_notify ("GREETER %s EXIT CODE=%d", getenv ("DISPLAY"), return_value);
+        status_notify ("%s EXIT CODE=%d", greeter_id, return_value);
         return return_value;
     }
 
@@ -221,11 +231,11 @@ main (int argc, char **argv)
 
     if (xcb_connection_has_error (connection))
     {
-        status_notify ("GREETER %s FAIL-CONNECT-XSERVER", getenv ("DISPLAY"));
+        status_notify ("%s FAIL-CONNECT-XSERVER", greeter_id);
         return EXIT_FAILURE;
     }
 
-    status_notify ("GREETER %s CONNECT-XSERVER", getenv ("DISPLAY"));
+    status_notify ("%s CONNECT-XSERVER", greeter_id);
 
     greeter = lightdm_greeter_new ();
     g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL);
@@ -233,19 +243,19 @@ main (int argc, char **argv)
     g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
     g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (autologin_timer_expired_cb), NULL);
 
-    status_notify ("GREETER %s CONNECT-TO-DAEMON", getenv ("DISPLAY"));
+    status_notify ("%s CONNECT-TO-DAEMON", greeter_id);
     if (!lightdm_greeter_connect_sync (greeter, NULL))
     {
-        status_notify ("GREETER %s FAIL-CONNECT-DAEMON", getenv ("DISPLAY"));
+        status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
         return EXIT_FAILURE;
     }
 
-    status_notify ("GREETER %s CONNECTED-TO-DAEMON", getenv ("DISPLAY"));
+    status_notify ("%s CONNECTED-TO-DAEMON", greeter_id);
 
     if (lightdm_greeter_get_select_user_hint (greeter))
-        status_notify ("GREETER %s SELECT-USER-HINT USERNAME=%s", getenv ("DISPLAY"), lightdm_greeter_get_select_user_hint (greeter));
+        status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, lightdm_greeter_get_select_user_hint (greeter));
     if (lightdm_greeter_get_lock_hint (greeter))
-        status_notify ("GREETER %s LOCK-HINT", getenv ("DISPLAY"));
+        status_notify ("%s LOCK-HINT", greeter_id);
 
     g_main_loop_run (loop);
 

diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
index 44c3e482f7bc88fc190fe2e409b2ed6897ac82c1..d41344a8c871b95cc656248f37be8388d4a74443 100755 (executable)
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -9,10 +9,18 @@ import signal
 from gi.repository import GLib
 from gi.repository import LightDM
 
+display = os.getenv ('DISPLAY');
+if display is None:
+    greeter_id = 'GREETER-?'
+elif display.startswith (':'):
+    greeter_id = 'GREETER-X-%s' % display[1:]
+else:
+    greeter_id = 'GREETER-X-%s' % display
+
 loop = GLib.MainLoop ()
 
 def sigterm_cb (data):
-    status_notify ('GREETER %s TERMINATE SIGNAL=%d' % (os.getenv ('DISPLAY'), signal.SIGTERM))
+    status_notify ('%s TERMINATE SIGNAL=%d' % (greeter_id, signal.SIGTERM))
     loop.quit ()
 GLib.unix_signal_add (GLib.PRIORITY_DEFAULT, signal.SIGTERM, sigterm_cb, None)
 
@@ -33,62 +41,62 @@ def request_cb (channel, condition):
         (l,) = struct.unpack ('i', length)
         request = status_socket.recv (l)
 
-    r = 'GREETER %s AUTHENTICATE' % os.getenv ('DISPLAY')
+    r = '%s AUTHENTICATE' % greeter_id
     if request == r:
         greeter.authenticate (None)
 
-    r = 'GREETER %s AUTHENTICATE USERNAME=' % os.getenv ('DISPLAY')
+    r = '%s AUTHENTICATE USERNAME=' % greeter_id
     if request.startswith (r):
         greeter.authenticate (request[len(r):])
 
-    r = 'GREETER %s AUTHENTICATE-GUEST' % os.getenv ('DISPLAY')
+    r = '%s AUTHENTICATE-GUEST' % greeter_id
     if request == r:
         greeter.authenticate_as_guest ()
 
-    r = 'GREETER %s AUTHENTICATE-AUTOLOGIN' % os.getenv ('DISPLAY')
+    r = '%s AUTHENTICATE-AUTOLOGIN' % greeter_id
     if request == r:
         greeter.authenticate_autologin ()
 
-    r = 'GREETER %s AUTHENTICATE-REMOTE SESSION=' % os.getenv ('DISPLAY')
+    r = '%s AUTHENTICATE-REMOTE SESSION=' % greeter_id
     if request.startswith (r):
         greeter.authenticate_remote (request[len(r):], None)
 
-    r = 'GREETER %s RESPOND TEXT=\"' % os.getenv ('DISPLAY')
+    r = '%s RESPOND TEXT=\"' % greeter_id
     if request.startswith (r):
         greeter.respond (request[len (r):-1])
 
-    r = 'GREETER %s START-SESSION' % os.getenv ('DISPLAY')
+    r = '%s START-SESSION' % greeter_id
     if request == r:
         if not greeter.start_session_sync (None):
-            status_notify ('GREETER %s SESSION-FAILED' % os.getenv ('DISPLAY'))
+            status_notify ('%s SESSION-FAILED' % greeter_id)
 
-    r = 'GREETER %s START-SESSION SESSION=' % os.getenv ('DISPLAY')
+    r = '%s START-SESSION SESSION=' % greeter_id
     if request.startswith (r):
         if not greeter.start_session_sync (request[len(r):]):
-            status_notify ('GREETER %s SESSION-FAILED' % os.getenv ('DISPLAY'))
+            status_notify ('%s SESSION-FAILED' % greeter_id)
 
-    r = 'GREETER %s LOG-LAYOUT' % os.getenv ('DISPLAY')
+    r = '%s LOG-LAYOUT' % greeter_id
     if request == r:
         layout = LightDM.get_layout ().get_name ()
-        status_notify ('GREETER %s LOG-LAYOUT LAYOUT=%s' % (os.getenv ('DISPLAY'), layout))
+        status_notify ('%s LOG-LAYOUT LAYOUT=%s' % (greeter_id, layout))
 
-    r = 'GREETER %s LOG-LAYOUT USERNAME=' % os.getenv ('DISPLAY')
+    r = '%s LOG-LAYOUT USERNAME=' % greeter_id
     if request.startswith (r):
         username = request[len(r):]
         user = LightDM.UserList.get_instance ().get_user_by_name (username)
         layout = user.get_layout ()
         if layout is None:
             layout = ''
-        status_notify ('GREETER %s LOG-LAYOUT USERNAME=%s LAYOUT=%s' % (os.getenv ('DISPLAY'), username, layout))
+        status_notify ('%s LOG-LAYOUT USERNAME=%s LAYOUT=%s' % (greeter_id, username, layout))
 
-    r = 'GREETER %s LOG-LANGUAGE USERNAME=' % os.getenv ('DISPLAY')  
+    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)
         language = lightdm_user_get_language (user)
         if language is None:
             language = ''
-        status_notify ('GREETER %s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (os.getenv ('DISPLAY'), username, language))
+        status_notify ('%s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (greeter_id, username, language))
 
     return True
 
@@ -97,16 +105,16 @@ status_socket = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM)
 status_socket.connect (path)
 GLib.io_add_watch (status_socket.fileno (), GLib.IO_IN | GLib.IO_HUP, request_cb)
 
-status_notify ('GREETER %s START' % os.getenv ('DISPLAY'))
+status_notify ('%s START' % greeter_id)
 
 # NOTE: There don't seem to be any good X bindings so we have to mock up our own...
-(host, display) = os.getenv ('DISPLAY').split (':')
+(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)
+    x_socket.connect ('/tmp/.X11-unix/X%s' % display_number)
 else:
     x_socket = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
-    x_socket.connect ((host, 6000 + int (display)))
+    x_socket.connect ((host, 6000 + int (display_number)))
 authority = subprocess.check_output(['xauth', 'list']).split ()
 auth_name = ''
 auth_data = ''
@@ -124,16 +132,16 @@ def pad (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 ('GREETER %s FAIL-CONNECT-XSERVER' % os.getenv ('DISPLAY'))
+    status_notify ('%s FAIL-CONNECT-XSERVER' % greeter_id)
     exit (1)
 
-status_notify ('GREETER %s CONNECT-XSERVER' % (os.getenv ('DISPLAY')))
+status_notify ('%s CONNECT-XSERVER' % (greeter_id))
 
 def show_message_cb (greeter, text, type):
-    status_notify ('GREETER %s SHOW-MESSAGE TEXT=\"%s\"' % (os.getenv ('DISPLAY'), text))
+    status_notify ('%s SHOW-MESSAGE TEXT=\"%s\"' % (greeter_id, text))
 
 def show_prompt_cb (greeter, text, type):
-    status_notify ('GREETER %s SHOW-PROMPT TEXT=\"%s\"' % (os.getenv ('DISPLAY'), text))
+    status_notify ('%s SHOW-PROMPT TEXT=\"%s\"' % (greeter_id, text))
 
 def authentication_complete_cb (greeter):
     if greeter.get_is_authenticated ():
@@ -141,12 +149,12 @@ def authentication_complete_cb (greeter):
     else:
         is_authenticated = 'FALSE'
     if greeter.get_authentication_user () is not None:
-        status_notify ('GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s' % (os.getenv ('DISPLAY'), greeter.get_authentication_user (), is_authenticated))
+        status_notify ('%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s' % (greeter_id, greeter.get_authentication_user (), is_authenticated))
     else:
-        status_notify ('GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s' % (os.getenv ('DISPLAY'), is_authenticated))
+        status_notify ('%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s' % (greeter_id, is_authenticated))
 
 def autologin_timer_expired_cb (greeter):
-    status_notify ('GREETER %s AUTOLOGIN-TIMER-EXPIRED' % os.getenv ('DISPLAY'))
+    status_notify ('%s AUTOLOGIN-TIMER-EXPIRED' % greeter_id)
 
 greeter = LightDM.Greeter ()
 greeter.connect ('show-message', show_message_cb)
@@ -154,16 +162,16 @@ greeter.connect ('show-prompt', show_prompt_cb)
 greeter.connect ('authentication-complete', authentication_complete_cb)
 greeter.connect ('autologin-timer-expired', autologin_timer_expired_cb)
 
-status_notify ('GREETER %s CONNECT-TO-DAEMON' % os.getenv ('DISPLAY'))
+status_notify ('%s CONNECT-TO-DAEMON' % greeter_id)
 if not greeter.connect_sync ():
-    status_notify ('GREETER %s FAIL-CONNECT-DAEMON' % os.getenv ('DISPLAY'))
+    status_notify ('%s FAIL-CONNECT-DAEMON' % greeter_id)
     exit (1)
 
-status_notify ('GREETER %s CONNECTED-TO-DAEMON' % os.getenv ('DISPLAY'))
+status_notify ('%s CONNECTED-TO-DAEMON' % greeter_id)
 
 if greeter.get_select_user_hint () is not None:
-    status_notify ('GREETER %s SELECT-USER-HINT USERNAME=%s' % (os.getenv ('DISPLAY'), greeter.get_select_user_hint ()))
+    status_notify ('%s SELECT-USER-HINT USERNAME=%s' % (greeter_id, greeter.get_select_user_hint ()))
 if greeter.get_lock_hint ():
-    status_notify ('GREETER %s LOCK-HINT' % os.getenv ('DISPLAY'));
+    status_notify ('%s LOCK-HINT' % greeter_id);
 
 loop.run ()

diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index 68ab1674ea51b1307f9602a9a0b63bd1ade8d71f..9a34567c7f488dad7197756bce4f49d512e4abef 100644 (file)
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <signal.h>
 #include <glib-object.h>
-#include <xcb/xcb.h>
 #include <QLightDM/Greeter>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
@@ -12,6 +11,7 @@
 #include "test-qt-greeter.h"
 #include "status.h"
 
+static gchar *greeter_id;
 static QCoreApplication *app = NULL;
 static QSettings *config = NULL;
 static TestGreeter *greeter = NULL;
@@ -26,33 +26,33 @@ TestGreeter::TestGreeter ()
 
 void TestGreeter::showMessage (QString text, QLightDM::Greeter::MessageType type)
 {
-    status_notify ("GREETER %s SHOW-MESSAGE TEXT=\"%s\"", getenv ("DISPLAY"), text.toAscii ().constData ());
+    status_notify ("%s SHOW-MESSAGE TEXT=\"%s\"", greeter_id, text.toAscii ().constData ());
 }
 
 void TestGreeter::showPrompt (QString text, QLightDM::Greeter::PromptType type)
 {
-    status_notify ("GREETER %s SHOW-PROMPT TEXT=\"%s\"", getenv ("DISPLAY"), text.toAscii ().constData ());
+    status_notify ("%s SHOW-PROMPT TEXT=\"%s\"", greeter_id, text.toAscii ().constData ());
 }
 
 void TestGreeter::authenticationComplete ()
 {
     if (authenticationUser () != "")
-        status_notify ("GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s",
-                       getenv ("DISPLAY"),
+        status_notify ("%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s",
+                       greeter_id,
                        authenticationUser ().toAscii ().constData (), isAuthenticated () ? "TRUE" : "FALSE");
     else
-        status_notify ("GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", getenv ("DISPLAY"), isAuthenticated () ? "TRUE" : "FALSE");
+        status_notify ("%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", greeter_id, isAuthenticated () ? "TRUE" : "FALSE");
 }
 
 void TestGreeter::autologinTimerExpired ()
 {
-    status_notify ("GREETER %s AUTOLOGIN-TIMER-EXPIRED", getenv ("DISPLAY"));
+    status_notify ("%s AUTOLOGIN-TIMER-EXPIRED", greeter_id);
 }
 
 static void
 signal_cb (int signum)
 {
-    status_notify ("GREETER %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum);
+    status_notify ("%s TERMINATE SIGNAL=%d", greeter_id, signum);
     _exit (EXIT_SUCCESS);
 }
 
@@ -67,32 +67,32 @@ request_cb (const gchar *request)
         return;
     }
   
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE", greeter_id);
     if (strcmp (request, r) == 0)
         greeter->authenticate ();
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE USERNAME=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE USERNAME=", greeter_id);
     if (g_str_has_prefix (request, r))
         greeter->authenticate (request + strlen (r));
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-GUEST", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-GUEST", greeter_id);
     if (strcmp (request, r) == 0)
         greeter->authenticateAsGuest ();
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-AUTOLOGIN", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-AUTOLOGIN", greeter_id);
     if (strcmp (request, r) == 0)
         greeter->authenticateAutologin ();
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s AUTHENTICATE-REMOTE SESSION=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s AUTHENTICATE-REMOTE SESSION=", greeter_id);
     if (g_str_has_prefix (request, r))
         greeter->authenticateRemote (request + strlen (r), NULL);
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s RESPOND TEXT=\"", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s RESPOND TEXT=\"", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         gchar *text = g_strdup (request + strlen (r));
@@ -102,19 +102,19 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s START-SESSION", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s START-SESSION", greeter_id);
     if (strcmp (request, r) == 0)
     {
         if (!greeter->startSessionSync ())
-            status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY"));
+            status_notify ("%s SESSION-FAILED", greeter_id);
     }
     g_free (r);
 
-    r = g_strdup_printf ("GREETER %s START-SESSION SESSION=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s START-SESSION SESSION=", greeter_id);
     if (g_str_has_prefix (request, r))
     {
         if (!greeter->startSessionSync (request + strlen (r)))
-            status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY"));
+            status_notify ("%s SESSION-FAILED", greeter_id);
     }
     g_free (r);
 }
@@ -122,10 +122,20 @@ request_cb (const gchar *request)
 int
 main(int argc, char *argv[])
 {
+    gchar *display;
+
 #if !defined(GLIB_VERSION_2_36)
     g_type_init ();
 #endif
 
+    display = getenv ("DISPLAY");
+    if (display == NULL)
+        greeter_id = g_strdup ("GREETER-?");
+    else if (display[0] == ':')
+        greeter_id = g_strdup_printf ("GREETER-X-%s", display + 1);
+    else
+        greeter_id = g_strdup_printf ("GREETER-X-%s", display);
+
     status_connect (request_cb);
 
     app = new QCoreApplication (argc, argv);
@@ -133,7 +143,7 @@ main(int argc, char *argv[])
     signal (SIGINT, signal_cb);
     signal (SIGTERM, signal_cb);
 
-    status_notify ("GREETER %s START", getenv ("DISPLAY"));
+    status_notify ("%s START", greeter_id);
 
     config = new QSettings (g_build_filename (getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), QSettings::IniFormat);
 
@@ -141,27 +151,27 @@ main(int argc, char *argv[])
 
     if (xcb_connection_has_error (connection))
     {
-        status_notify ("GREETER %s FAIL-CONNECT-XSERVER", getenv ("DISPLAY"));
+        status_notify ("%s FAIL-CONNECT-XSERVER", greeter_id);
         return EXIT_FAILURE;
     }
 
-    status_notify ("GREETER %s CONNECT-XSERVER", getenv ("DISPLAY"));
+    status_notify ("%s CONNECT-XSERVER", greeter_id);
 
     greeter = new TestGreeter();
   
-    status_notify ("GREETER %s CONNECT-TO-DAEMON", getenv ("DISPLAY"));
+    status_notify ("%s CONNECT-TO-DAEMON", greeter_id);
     if (!greeter->connectSync())
     {
-        status_notify ("GREETER %s FAIL-CONNECT-DAEMON", getenv ("DISPLAY"));
+        status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
         return EXIT_FAILURE;
     }
 
-    status_notify ("GREETER %s CONNECTED-TO-DAEMON", getenv ("DISPLAY"));
+    status_notify ("%s CONNECTED-TO-DAEMON", greeter_id);
 
     if (greeter->selectUserHint() != "")
-        status_notify ("GREETER %s SELECT-USER-HINT USERNAME=%s", getenv ("DISPLAY"), greeter->selectUserHint ().toAscii ().constData ());
+        status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, greeter->selectUserHint ().toAscii ().constData ());
     if (greeter->lockHint())
-        status_notify ("GREETER %s LOCK-HINT", getenv ("DISPLAY"));
+        status_notify ("%s LOCK-HINT", greeter_id);
 
     return app->exec();
 }

diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 40e9a9378e8cd9b90ef8552be6f5f9f64d1343ed..cf755917f170e81d709b0858d9b514785768c46f 100644 (file)
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -22,8 +22,12 @@ static GKeyFile *config;
 static GSocket *status_socket = NULL;
 static gchar *status_socket_name = NULL;
 static GList *statuses = NULL;
+typedef struct
+{
+    gchar *text;
+    gboolean done;
+} ScriptLine;
 static GList *script = NULL;
-static GList *script_iter = NULL;
 static guint status_timeout = 0;
 static gchar *temp_dir = NULL;
 static int service_count;
@@ -223,8 +227,8 @@ quit (int status)
     if (temp_dir)
     {
         gchar *command = g_strdup_printf ("rm -r %s", temp_dir);
-        if (system (command))
-            perror ("Failed to delete temp directory");
+        //if (system (command))
+        //    perror ("Failed to delete temp directory");
     }
 
     exit (status);
@@ -251,12 +255,47 @@ fail (const gchar *event, const gchar *expected)
     quit (EXIT_FAILURE);
 }
 
-static const gchar *
-get_script_line ()
+static gchar *
+get_prefix (const gchar *text)
+{
+    gchar *prefix;
+    gint i;
+
+    prefix = g_strdup (text);
+    for (i = 0; prefix[i] != '\0' && prefix[i] != ' '; i++);
+    prefix[i] = '\0';
+
+    return prefix;
+}
+
+static ScriptLine *
+get_script_line (const gchar *prefix)
 {
-    if (!script_iter)
-        return NULL;
-    return script_iter->data;
+    GList *link;
+
+    for (link = script; link; link = link->next)
+    {
+        ScriptLine *line = link->data;
+
+        /* Ignore lines with other prefixes */
+        if (prefix)
+        {
+            gchar *p;
+            gboolean matches;
+
+            p = get_prefix (line->text);
+            matches = strcmp (prefix, p) == 0;
+            g_free (p);
+
+            if (!matches)
+                continue;
+        }
+
+        if (!line->done)
+            return line;
+    }
+
+    return NULL;
 }
 
 static void
@@ -444,9 +483,9 @@ handle_command (const gchar *command)
         }
     }
     /* Forward to external processes */
-    else if (strcmp (name, "SESSION") == 0 ||
-             strcmp (name, "GREETER") == 0 ||
-             strcmp (name, "XSERVER") == 0)
+    else if (g_str_has_prefix (name, "SESSION-") ||
+             g_str_has_prefix (name, "GREETER-") ||
+             g_str_has_prefix (name, "XSERVER-"))
     {
         GList *link;
         for (link = status_clients; link; link = link->next)
@@ -479,60 +518,70 @@ run_commands ()
     /* Stop daemon if requested */
     while (TRUE)
     {
-        const gchar *command;
+        ScriptLine *line;
 
         /* Commands start with an asterisk */
-        command = get_script_line ();
-        if (!command || command[0] != '*')
+        line = get_script_line (NULL);
+        if (!line || line->text[0] != '*')
             break;
 
-        statuses = g_list_append (statuses, g_strdup (command));
-        script_iter = script_iter->next;
+        statuses = g_list_append (statuses, g_strdup (line->text));
+        line->done = TRUE;
 
-        handle_command (command + 1);
+        handle_command (line->text + 1);
     }
 
     /* Stop at the end of the script */
-    if (get_script_line () == NULL)
+    if (get_script_line (NULL) == NULL)
         quit (EXIT_SUCCESS);
 }
 
 static gboolean
 status_timeout_cb (gpointer data)
 {
-    fail ("(timeout)", get_script_line ());
+    ScriptLine *line;
+
+    line = get_script_line (NULL);
+    fail ("(timeout)", line ? line->text : NULL);
+
     return FALSE;
 }
 
 static void
 check_status (const gchar *status)
 {
-    const gchar *pattern;
+    ScriptLine *line;
     gboolean result = FALSE;
+    gchar *prefix;
 
     if (stop)
         return;
   
     statuses = g_list_append (statuses, g_strdup (status));
-  
+
     if (getenv ("DEBUG"))
         g_print ("%s\n", status);
 
     /* Try and match against expected */
-    pattern = get_script_line ();
-    if (pattern)
+    prefix = get_prefix (status);
+    line = get_script_line (prefix);
+    g_free (prefix);
+    if (line)
     {
-        gchar *full_pattern = g_strdup_printf ("^%s$", pattern);
+        gchar *full_pattern = g_strdup_printf ("^%s$", line->text);
         result = g_regex_match_simple (full_pattern, status, 0, 0);
         g_free (full_pattern);
     }
   
     if (!result)
     {
-        fail (NULL, pattern);
+        if (line == NULL)
+            line = get_script_line (NULL);
+        fail (NULL, line ? line->text : NULL);
         return;
     }
-    script_iter = script_iter->next;
+
+    line->done = TRUE;
 
     /* Restart timeout */
     g_source_remove (status_timeout);
@@ -615,11 +664,16 @@ load_script (const gchar *filename)
     /* Load lines with #? prefix as expected behaviour */
     for (i = 0; lines[i]; i++)
     {
-        gchar *line = g_strstrip (lines[i]);
-        if (g_str_has_prefix (line, "#?"))
-            script = g_list_append (script, g_strdup (line+2));
+        gchar *text = g_strstrip (lines[i]);
+        if (g_str_has_prefix (text, "#?"))
+        {
+            ScriptLine *line;
+            line = g_malloc0 (sizeof (ScriptLine));
+            line->text = g_strdup (text + 2);
+            line->done = FALSE;
+            script = g_list_append (script, line);
+        }
     }
-    script_iter = script;
     g_strfreev (lines);
 }
 
@@ -1291,7 +1345,7 @@ main (int argc, char **argv)
     /* Set up a skeleton file system */
     g_mkdir_with_parents (g_strdup_printf ("%s/etc", temp_dir), 0755);
     g_mkdir_with_parents (g_strdup_printf ("%s/usr/share", temp_dir), 0755);
-    g_mkdir_with_parents (g_strdup_printf ("%s/usr/tmp", temp_dir), 0755);
+    g_mkdir_with_parents (g_strdup_printf ("%s/tmp", temp_dir), 0755);
 
     /* Copy over the configuration */
     g_mkdir_with_parents (g_strdup_printf ("%s/etc/lightdm", temp_dir), 0755);

diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index 49f3f5c0b45c244073afa4b7b20df5d722b44706..ebbfa8a683636146fe8befe6e42dd35c76d1d5b7 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -6,25 +6,24 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <grp.h>
-#include <xcb/xcb.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 
 #include "status.h"
 
+static gchar *session_id;
+
 static GMainLoop *loop;
 
 static GString *open_fds;
 
 static GKeyFile *config;
 
-static xcb_connection_t *connection;
-
 static void
 quit_cb (int signum)
 {
-    status_notify ("SESSION %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum);
+    status_notify ("%s TERMINATE SIGNAL=%d", session_id, signum);
     exit (EXIT_SUCCESS);
 }
 
@@ -39,20 +38,20 @@ request_cb (const gchar *request)
         return;
     }
   
-    r = g_strdup_printf ("SESSION %s LOGOUT", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOGOUT", session_id);
     if (strcmp (request, r) == 0)
         exit (EXIT_SUCCESS);
     g_free (r);
   
-    r = g_strdup_printf ("SESSION %s CRASH", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s CRASH", session_id);
     if (strcmp (request, r) == 0)
         kill (getpid (), SIGSEGV);
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s LOCK-SEAT", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOCK-SEAT", session_id);
     if (strcmp (request, r) == 0)
     {
-        status_notify ("SESSION %s LOCK-SEAT", getenv ("DISPLAY"));
+        status_notify ("%s LOCK-SEAT", session_id);
         g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL),
                                      "org.freedesktop.DisplayManager",
                                      getenv ("XDG_SEAT_PATH"),
@@ -67,10 +66,10 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s LOCK-SESSION", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LOCK-SESSION", session_id);
     if (strcmp (request, r) == 0)
     {
-        status_notify ("SESSION %s LOCK-SESSION", getenv ("DISPLAY"));
+        status_notify ("%s LOCK-SESSION", session_id);
         g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL),
                                      "org.freedesktop.DisplayManager",
                                      getenv ("XDG_SESSION_PATH"),
@@ -85,7 +84,7 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s LIST-GROUPS", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LIST-GROUPS", session_id);
     if (strcmp (request, r) == 0)
     {
         int n_groups, i;
@@ -108,31 +107,31 @@ request_cb (const gchar *request)
             else
                 g_string_append_printf (group_list, "%d", groups[i]);
         }
-        status_notify ("SESSION %s LIST-GROUPS GROUPS=%s", getenv ("DISPLAY"), group_list->str);
+        status_notify ("%s LIST-GROUPS GROUPS=%s", session_id, group_list->str);
         g_string_free (group_list, TRUE);
         free (groups);
     }
 
-    r = g_strdup_printf ("SESSION %s READ-ENV NAME=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s READ-ENV NAME=", session_id);
     if (g_str_has_prefix (request, r))
     {
         const gchar *name = request + strlen (r);
         const gchar *value = g_getenv (name);
-        status_notify ("SESSION %s READ-ENV NAME=%s VALUE=%s", getenv ("DISPLAY"), name, value ? value : "");
+        status_notify ("%s READ-ENV NAME=%s VALUE=%s", session_id, name, value ? value : "");
     }
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s WRITE-STDOUT TEXT=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s WRITE-STDOUT TEXT=", session_id);
     if (g_str_has_prefix (request, r))
         g_print ("%s", request + strlen (r));
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s WRITE-STDERR TEXT=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s WRITE-STDERR TEXT=", session_id);
     if (g_str_has_prefix (request, r))
         g_printerr ("%s", request + strlen (r));
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s READ FILE=", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s READ FILE=", session_id);
     if (g_str_has_prefix (request, r))
     {
         const gchar *name = request + strlen (r);
@@ -140,24 +139,33 @@ request_cb (const gchar *request)
         GError *error = NULL;
 
         if (g_file_get_contents (name, &contents, NULL, &error))
-            status_notify ("SESSION %s READ FILE=%s TEXT=%s", getenv ("DISPLAY"), name, contents);
+            status_notify ("%s READ FILE=%s TEXT=%s", session_id, name, contents);
         else
-            status_notify ("SESSION %s READ FILE=%s ERROR=%s", getenv ("DISPLAY"), name, error->message);
+            status_notify ("%s READ FILE=%s ERROR=%s", session_id, name, error->message);
         g_clear_error (&error);
     }
     g_free (r);
 
-    r = g_strdup_printf ("SESSION %s LIST-UNKNOWN-FILE-DESCRIPTORS", getenv ("DISPLAY"));
+    r = g_strdup_printf ("%s LIST-UNKNOWN-FILE-DESCRIPTORS", session_id);
     if (strcmp (request, r) == 0)
-        status_notify ("SESSION %s LIST-UNKNOWN-FILE-DESCRIPTORS FDS=%s", getenv ("DISPLAY"), open_fds->str);
+        status_notify ("%s LIST-UNKNOWN-FILE-DESCRIPTORS FDS=%s", session_id, open_fds->str);
     g_free (r);
 }
 
 int
 main (int argc, char **argv)
 {
+    gchar *display;
     int fd, open_max;
 
+    display = getenv ("DISPLAY");
+    if (display == NULL)
+        session_id = g_strdup ("SESSION-?");
+    else if (display[0] == ':')
+        session_id = g_strdup_printf ("SESSION-X-%s", display + 1);
+    else
+        session_id = g_strdup_printf ("SESSION-X-%s", display);
+
     open_fds = g_string_new ("");
     open_max = sysconf (_SC_OPEN_MAX);
     for (fd = STDERR_FILENO + 1; fd < open_max; fd++)
@@ -180,9 +188,9 @@ main (int argc, char **argv)
     status_connect (request_cb);
 
     if (argc > 1)
-        status_notify ("SESSION %s START NAME=%s USER=%s", getenv ("DISPLAY"), argv[1], getenv ("USER"));
+        status_notify ("%s START NAME=%s USER=%s", session_id, argv[1], getenv ("USER"));
     else
-        status_notify ("SESSION %s START USER=%s", getenv ("DISPLAY"), getenv ("USER"));
+        status_notify ("%s START USER=%s", session_id, getenv ("USER"));
 
     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);
@@ -191,13 +199,13 @@ main (int argc, char **argv)
 
     if (xcb_connection_has_error (connection))
     {
-        status_notify ("SESSION %s CONNECT-XSERVER-ERROR", getenv ("DISPLAY"));
+        status_notify ("%s CONNECT-XSERVER-ERROR", session_id);
         return EXIT_FAILURE;
     }
 
-    status_notify ("SESSION %s CONNECT-XSERVER", getenv ("DISPLAY"));
+    status_notify ("%s CONNECT-XSERVER", session_id);
 
-    g_main_loop_run (loop);    
+    g_main_loop_run (loop);
 
     return EXIT_SUCCESS;
 }

diff --git a/tests/src/x-server.c b/tests/src/x-server.c
index 9e76f80d20095d3d3e57432cc56245d325ac19d5..61af1724f321a7714c7a2adef007e6a8380318f4 100644 (file)
--- a/tests/src/x-server.c
+++ b/tests/src/x-server.c
@@ -775,8 +775,17 @@ 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 *socket_dir;
+        gchar *socket_filename;
+
+        socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL);
+        g_mkdir_with_parents (socket_dir, 0755);
+
+        socket_filename = g_strdup_printf ("X%d", server->priv->display_number);
+        server->priv->socket_path = g_build_filename (socket_dir, socket_filename, NULL);
+
+        g_free (socket_dir);
+        g_free (socket_filename);
 
         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 ||