Distinguish between different sessions in tests

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index b18482d10ba15738c2471956ecdb8cfc6aa7b562..d98156aec0eb5cb45beccbed3d41a9cfc819dbe3 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -24,12 +24,12 @@ logout-display=:50
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION START USER=guest-.*
+#?SESSION :50 START USER=guest-.*
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Logout of session
-#?SESSION LOGOUT
+#?SESSION :50 LOGOUT
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index 22ae5e58aca7c9270e33420ba9d0339ab4495be1..2b987914832c929708350db183b8a649f55e24c4 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -21,15 +21,15 @@ autologin-guest=true
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION START USER=guest-.*
+#?SESSION :50 START USER=guest-.*
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION 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 :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-logout.conf b/tests/scripts/autologin-logout.conf
index e6ca674cbd0162041b9cdaa3966021e9cacd2927..61a3f484ebcc60461ebcb024ea2dc247131affae 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -21,12 +21,12 @@ logout-display=:50
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Autologin session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Logout
-#?SESSION LOGOUT
+#?SESSION :50 LOGOUT
 
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index 89171dd1d4bd00da01cfc102c8b95100d137e475..30ab9abe5fbf716e0f3c8427c35b63c37ae0866b 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -18,13 +18,13 @@ autologin-user=carol
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START NAME=alternative USER=carol
+#?SESSION :50 START NAME=alternative USER=carol
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index 57ea08f7bc956abbdda5af049409cb4ef0b0daf8..bd9b90f7e0b12411ae07b042c840c58165a7493c 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -21,12 +21,12 @@ sigsegv=true
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Session crashes
-#?SESSION CRASH
+#?SESSION :50 CRASH
 
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15

diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index a5dbdf27545c3ce053b1bed27e67beb5eae0359c..956703a7c43a0be18eefb60e3cb7ee7a28f15ef6 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -21,16 +21,16 @@ crash-xserver=true
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
-#?SESSION CRASH-XSERVER
+#?SESSION :50 CRASH-XSERVER
 #?XSERVER :50 CRASH
 
 # User session is terminated
-#?SESSION TERMINATE SIGNAL=15
+#?SESSION :50 TERMINATE SIGNAL=15
 
 # X server restarts
 #?XSERVER :50 START

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 16bd339aa7ebd53476a8c893fc3cba99fdf9eac6..ad95e7fd5bc0ee42660f35b47ddddf1ff14d2de4 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -18,13 +18,13 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf
index b0091cb4807581ab02a43a36b3ecdf394888063d..725b08ff8b2a7ffbb792a3e4c8acf688b7af17d6 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -18,13 +18,13 @@ autologin-user=dave
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=dave
+#?SESSION :50 START USER=dave
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 7619d4275c13b17a9a4c1b4e68bb7ba352869141..ec0b980902b8ba2b4e27ff9f51c6db3a8b15df5b 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -36,12 +36,12 @@ logout-display=:50
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION START USER=guest-.*
+#?SESSION :50 START USER=guest-.*
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Logout of session
-#?SESSION LOGOUT
+#?SESSION :50 LOGOUT
 
 # Guest account removed
 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.*

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 72049cf51b95c229f14088504116087682812365..45955c71c880ef9c2be4a04944cd49dfa60b1bb4 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -33,14 +33,14 @@ login-guest=true
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION START USER=guest-.*
+#?SESSION :50 START USER=guest-.*
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION 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 :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-logout.conf b/tests/scripts/login-logout.conf
index 7b990d2481147230d3b3ab0610896e2a2bc50daf..ae0821d435ae62a998243cb4c7d04aacdaad2448 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -36,12 +36,12 @@ logout-display=:50
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Logout of session
-#?SESSION LOGOUT
+#?SESSION :50 LOGOUT
 
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index 2b71e1953bc38896c2518360463d48e9dba23695..3a8af8faa8f44e9d1e9b9a84038762099db55ec9 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -33,13 +33,13 @@ username=carol
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START NAME=alternative USER=carol
+#?SESSION :50 START NAME=alternative USER=carol
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index b83c60dbf6b3f6e10eda2eea77e25e2517d7668b..bd719be690974b73d984f37c3e4ffaa56b5a18cb 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -36,13 +36,13 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index 2c59e82fca1a9310bcd7f125d525ebec67f5c371..b862c3aa5d4b6e89190f713be2495f5340dc1864 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -30,13 +30,13 @@ username=bob
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=bob
+#?SESSION :50 START USER=bob
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
index fd55ed9b6a1a890999f88364a5dfd3b993cf975e..a7caaadbd11d78a4364678c6b601ac807d73bb2c 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -34,13 +34,13 @@ session=alternative
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START NAME=alternative USER=alice
+#?SESSION :50 START NAME=alternative USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
index f9ecf257bfbe4919c65a0c9ba3c8bb4450a514f0..4d7054bd7497ecce1929d1922e9f38010c4d1a62 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -30,13 +30,13 @@ username=carol
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START NAME=alternative USER=carol
+#?SESSION :50 START NAME=alternative USER=carol
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index 396298582b543a2f3091eedeb1caec7c5236747a..5e38cd9ae1d0dc1a3694b3c90b056f91c8cd6870 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -36,12 +36,12 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Session crashes
-#?SESSION CRASH
+#?SESSION :50 CRASH
 
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 0e6e7401ebf7cf1ddd54e131b267fbe54f0feaa4..686bd05cba5a172e5ab4f82526042242e5954860 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -36,16 +36,16 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
-#?SESSION CRASH-XSERVER
+#?SESSION :50 CRASH-XSERVER
 #?XSERVER :50 CRASH
 
 # User session is terminated
-#?SESSION TERMINATE SIGNAL=15
+#?SESSION :50 TERMINATE SIGNAL=15
 
 # X server restarts
 #?XSERVER :50 START

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index 4b2edb60ff17f1d584e85bc1b44272080ba09301..4dbe3df33be1ef17bdcfaf14e2e07dd5ec868050 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -33,13 +33,13 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf
index 141bc22d36406cc5e5b8532186f29983d6ddb1f5..3597e71500cb538b5c5a0d027e71a94c0675f849 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -21,13 +21,13 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index 0b18cfb954a8e66fb6040fa099fb5c1e517506d2..83bc04b63619cfddf726ad74e32febc6caa571a8 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -21,13 +21,13 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 9e2348dbf94f7a64fe710abe8e57ba78a728366a..260b10e2d7baa1d7c69b4f631f49d6d8c5c2fd1b 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -29,12 +29,12 @@ logout-display=:50
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Logout
-#?SESSION LOGOUT
+#?SESSION :50 LOGOUT
 
 # Script hook runs
 #?SCRIPT-HOOK SESSION-CLEANUP

diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index 584a0bcc69e8616ae2b704fe93f01ed1493d871c..a6b242e9681d97f335b037aa03bf70f91f99ac06 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -33,9 +33,9 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
@@ -58,8 +58,8 @@ password=password
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 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 40334d9a1e80bd286b19721c6aec7b0589edaf8d..1de2069fdb7020e58cbe449989da3c8dbd4daef6 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -19,9 +19,9 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Switch to guest
 #?*SWITCH-TO-GUEST
@@ -38,9 +38,9 @@ autologin-user=alice
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION START USER=guest-.*
+#?SESSION :51 START USER=guest-.*
 #?XSERVER :51 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :51 CONNECT-XSERVER
 
 # Switch again, should not do anything as guest already running
 #?*SWITCH-TO-GUEST
@@ -50,9 +50,9 @@ autologin-user=alice
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 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 :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :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 8d6b65e06ecd74a8cbc8bc874ac080e5977d74b8..282944f260af58f69066774316583587a891e90b 100644 (file)
--- a/tests/scripts/switch-to-user-existing-session.conf
+++ b/tests/scripts/switch-to-user-existing-session.conf
@@ -19,9 +19,9 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Switch to Alice's account
 #?*SWITCH-TO-USER USERNAME=alice
@@ -33,6 +33,6 @@ autologin-user=alice
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15)
-#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :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 104abee8d2abd70113b9127f487458965d9d7d1d..771fe45b2b65e6c92bc2bafd7c7a60e4227fcb23 100644 (file)
--- a/tests/scripts/switch-to-user-logout.conf
+++ b/tests/scripts/switch-to-user-logout.conf
@@ -22,9 +22,9 @@ logout-display=:51
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Switch to Bob's account
 #?*SWITCH-TO-USER USERNAME=bob
@@ -38,12 +38,12 @@ logout-display=:51
 #?XSERVER :51 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION START USER=bob
+#?SESSION :51 START USER=bob
 #?XSERVER :51 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :51 CONNECT-XSERVER
 
-# First session terminates
-#?SESSION LOGOUT
+# Session terminates
+#?SESSION :51 LOGOUT
 
 # X server stops
 #?XSERVER :51 TERMINATE SIGNAL=15
@@ -65,8 +65,8 @@ logout-display=:51
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER 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 070fd213bc0d7cdcd9dc8e3a5bb13411bb731caf..c27e718fcfa6f2d36c768cb578417f1609744352 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -19,9 +19,9 @@ autologin-user=alice
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Switch to Bob's account
 #?*SWITCH-TO-USER USERNAME=bob
@@ -35,15 +35,15 @@ autologin-user=alice
 #?XSERVER :51 ACCEPT-CONNECT
 
 # New session starts
-#?SESSION START USER=bob
+#?SESSION :51 START USER=bob
 #?XSERVER :51 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :51 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION 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 :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :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 510f666a6547e94d998dab420f5ec69f481e4755..e416ca2387d41250bf8ed641b8d309d9a8bb25e6 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -19,9 +19,9 @@ autologin-user=bob
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION START USER=bob
+#?SESSION :50 START USER=bob
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Switch to Alice's account
 #?*SWITCH-TO-USER USERNAME=alice
@@ -48,8 +48,8 @@ autologin-user=bob
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
-#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
-#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
-#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
+#?(XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index b401ce4884ae7e24102219e876a0dba0ef6fb5ee..a813a233e24fe3750e9f990c6365abe5aaf80147 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -50,12 +50,12 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION :50 START USER=alice
 #?XSERVER :50 ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION :50 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION TERMINATE SIGNAL=15|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)
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf
index 17ac832707f577dfe28b54c7f4c25d35597c7510..7676c23d33ae1018c75f4e2d67a16f5fd8c977d5 100644 (file)
--- a/tests/scripts/xdmcp-login.conf
+++ b/tests/scripts/xdmcp-login.conf
@@ -46,11 +46,11 @@ password=password
 #?GREETER TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION START USER=alice
+#?SESSION 127.0.0.1:98 START USER=alice
 #?XSERVER :98 TCP-ACCEPT-CONNECT
-#?SESSION CONNECT-XSERVER
+#?SESSION 127.0.0.1:98 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?SESSION TERMINATE SIGNAL=15
+#?SESSION 127.0.0.1:98 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index defcd7ea20b10d53590d901063011e650771c701..b4e01bae16fd8e5b43607df862132bd002e94894 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -14,7 +14,7 @@ static GKeyFile *config;
 static void
 quit_cb (int signum)
 {
-    notify_status ("SESSION TERMINATE SIGNAL=%d", signum);
+    notify_status ("SESSION %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum);
     exit (EXIT_SUCCESS);
 }
 
@@ -29,9 +29,9 @@ main (int argc, char **argv)
     signal (SIGTERM, quit_cb);
 
     if (argc > 1)
-        notify_status ("SESSION START NAME=%s USER=%s", argv[1], getenv ("USER"));
+        notify_status ("SESSION %s START NAME=%s USER=%s", getenv ("DISPLAY"), argv[1], getenv ("USER"));
     else
-        notify_status ("SESSION START USER=%s", getenv ("USER"));
+        notify_status ("SESSION %s START USER=%s", getenv ("DISPLAY"), getenv ("USER"));
 
     config = g_key_file_new ();
     if (g_getenv ("LIGHTDM_TEST_CONFIG"))
@@ -43,16 +43,16 @@ main (int argc, char **argv)
 
     if (xcb_connection_has_error (connection))
     {
-        notify_status ("SESSION CONNECT-XSERVER-ERROR");
+        notify_status ("SESSION %s CONNECT-XSERVER-ERROR", getenv ("DISPLAY"));
         return EXIT_FAILURE;
     }
 
-    notify_status ("SESSION CONNECT-XSERVER");
+    notify_status ("SESSION %s CONNECT-XSERVER", getenv ("DISPLAY"));
 
     if (g_key_file_get_boolean (config, "test-session-config", "crash-xserver", NULL))
     {
         const gchar *name = "SIGSEGV";
-        notify_status ("SESSION CRASH-XSERVER");
+        notify_status ("SESSION %s CRASH-XSERVER", getenv ("DISPLAY"));
         xcb_intern_atom (connection, FALSE, strlen (name), name);
         xcb_flush (connection);
     }
@@ -61,13 +61,13 @@ main (int argc, char **argv)
     if (logout_display && strcmp (logout_display, getenv ("DISPLAY")) == 0)
     {
         sleep (1);
-        notify_status ("SESSION LOGOUT");
+        notify_status ("SESSION %s LOGOUT", getenv ("DISPLAY"));
         return EXIT_SUCCESS;
     }
 
     if (g_key_file_get_boolean (config, "test-session-config", "sigsegv", NULL))
     {
-        notify_status ("SESSION CRASH");
+        notify_status ("SESSION %s CRASH", getenv ("DISPLAY"));
         kill (getpid (), SIGSEGV);
     }