Check X server display number correctly used in tests, update some tests

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 9d6e432d2113a3a6fe74fee40aa3c7cc46f16da6..698093ab58d6e4b4c0e21c62a8f709ca25aec9d4 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -3,7 +3,6 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99
 
 [test-session-config]
 logout=true

diff --git a/tests/scripts/autologin-logout.script b/tests/scripts/autologin-logout.script
index 65d41367741d39448291ca6fc6414707caee381e..8bb2945745f7824e4e5a78e61e15161e2bd308e2 100644 (file)
--- a/tests/scripts/autologin-logout.script
+++ b/tests/scripts/autologin-logout.script
@@ -5,27 +5,27 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Autologin session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Logout
 SESSION LOGOUT
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -35,6 +35,6 @@ GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER 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 8fc53f178301d215a50284e7c60fa651977c9f3a..aa49c563d91a2d36712a589f48d45a676ea58cd8 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -3,7 +3,6 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99
 
 [test-session-config]
 crash-xserver=true

diff --git a/tests/scripts/autologin-xserver-crash.script b/tests/scripts/autologin-xserver-crash.script
index 82b147dfef300c04316616d783bb567591cf2e9e..69c4f8fcbc3c4a2fd4ad4b0a8d86c538ab21ddc8 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.script
+++ b/tests/scripts/autologin-xserver-crash.script
@@ -5,35 +5,35 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
 SESSION CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # Session terminates
 SESSION TERMINATE SIGNAL=15
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER 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 5349581a1b9c7926ab4afdbab51e8e4b4a462bf6..c17c3f32903d673312568d96049c62fbc5f53a2a 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -3,4 +3,3 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99

diff --git a/tests/scripts/autologin.script b/tests/scripts/autologin.script
index 7e93061d8adab5f703a3c021e3dd00c91609a51e..8a024e6ed7f6a2f8c8a1d0102e9128ec280536f6 100644 (file)
--- a/tests/scripts/autologin.script
+++ b/tests/scripts/autologin.script
@@ -5,18 +5,18 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 28f1b5e87633f9b92201a539b8bf3d368303a994..7eea66a0b135f5d9363da6c0d8b59e808b9f66d1 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 crash-xserver=true

diff --git a/tests/scripts/greeter-xserver-crash.script b/tests/scripts/greeter-xserver-crash.script
index f8980e6eda2de948e15a06999a5ff7cbab303f03..26cfe628c94fbf469ff4c9e4a365e3569ebc4d29 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.script
+++ b/tests/scripts/greeter-xserver-crash.script
@@ -5,34 +5,34 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # X server crashes (triggered by user session)
 GREETER CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-guest-disabled.conf b/tests/scripts/login-gobject-guest-disabled.conf
index f8d412210bfe4535a0b09f5d37356c8b36d37e41..f09a8c483198711728248891bc73e7ffbe959d14 100644 (file)
--- a/tests/scripts/login-gobject-guest-disabled.conf
+++ b/tests/scripts/login-gobject-guest-disabled.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=false
 

diff --git a/tests/scripts/login-gobject-guest-disabled.script b/tests/scripts/login-gobject-guest-disabled.script
index 0a23c11850aca8a48cc536e6e1fe080bd0632066..42d766c4c2301894fb6a43871794c649985201bc 100644 (file)
--- a/tests/scripts/login-gobject-guest-disabled.script
+++ b/tests/scripts/login-gobject-guest-disabled.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-guest-fail-setup-script.conf b/tests/scripts/login-gobject-guest-fail-setup-script.conf
index ce2a5e05322f2de39a661a8a492a74edebde3c08..51c882088c1e5901b3fbd746b605c2c8e5a98d22 100644 (file)
--- a/tests/scripts/login-gobject-guest-fail-setup-script.conf
+++ b/tests/scripts/login-gobject-guest-fail-setup-script.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 

diff --git a/tests/scripts/login-gobject-guest-fail-setup-script.script b/tests/scripts/login-gobject-guest-fail-setup-script.script
index 9a75a855e94ec0a87e33178f6b6eeb93d1626231..3bc9624f3c4aadfee816ddade33da63aea87424e 100644 (file)
--- a/tests/scripts/login-gobject-guest-fail-setup-script.script
+++ b/tests/scripts/login-gobject-guest-fail-setup-script.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-guest-no-config.conf b/tests/scripts/login-gobject-guest-no-config.conf
index 7558978c437e80f107292f36da980f6c083b456c..50fc6fb5cc9ad34aa89d1435756a04b3a16dcb0d 100644 (file)
--- a/tests/scripts/login-gobject-guest-no-config.conf
+++ b/tests/scripts/login-gobject-guest-no-config.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 login-guest=true

diff --git a/tests/scripts/login-gobject-guest-no-config.script b/tests/scripts/login-gobject-guest-no-config.script
index a1c6fc197f181f11e5eb0f017a70c4f87810da85..e2e0b250f6ec696db9cd574ad3f2ae32dfffcec0 100644 (file)
--- a/tests/scripts/login-gobject-guest-no-config.script
+++ b/tests/scripts/login-gobject-guest-no-config.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-guest-no-setup-script.conf b/tests/scripts/login-gobject-guest-no-setup-script.conf
index ce2a5e05322f2de39a661a8a492a74edebde3c08..51c882088c1e5901b3fbd746b605c2c8e5a98d22 100644 (file)
--- a/tests/scripts/login-gobject-guest-no-setup-script.conf
+++ b/tests/scripts/login-gobject-guest-no-setup-script.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 

diff --git a/tests/scripts/login-gobject-guest-no-setup-script.script b/tests/scripts/login-gobject-guest-no-setup-script.script
index 3d86725e8b467b0d21adcc9a1c4bb5363f7d58e6..3847a1eaf6bddf3616e13b7678129608c9b69cd7 100644 (file)
--- a/tests/scripts/login-gobject-guest-no-setup-script.script
+++ b/tests/scripts/login-gobject-guest-no-setup-script.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-guest.conf b/tests/scripts/login-gobject-guest.conf
index ec7a395de8f0a04a49bbe71a39342b3d63c26019..15dad7afb8c49bfda6d98590358754fb1ba9732a 100644 (file)
--- a/tests/scripts/login-gobject-guest.conf
+++ b/tests/scripts/login-gobject-guest.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 setup-script=test-setup-guest

diff --git a/tests/scripts/login-gobject-guest.script b/tests/scripts/login-gobject-guest.script
index 4f20161c6297c39e9dccb10180032f12b77ace4c..c687182a701a8aa6e2779a991cd017d4bed5ee07 100644 (file)
--- a/tests/scripts/login-gobject-guest.script
+++ b/tests/scripts/login-gobject-guest.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -20,15 +20,15 @@ GREETER CONNECTED-TO-DAEMON
 GREETER LOGIN-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 
-# Greeter quits, session starts
+# Greeter quits, guest session starts
 GREETER QUIT
 SESSION START USER=guest
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-invalid-user.conf b/tests/scripts/login-gobject-invalid-user.conf
index ec50fab785a1598cef3452af1b9b6122ce71c60c..498627f7d0477273598642038cbee31264a825ae 100644 (file)
--- a/tests/scripts/login-gobject-invalid-user.conf
+++ b/tests/scripts/login-gobject-invalid-user.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=notauser
 password=password

diff --git a/tests/scripts/login-gobject-invalid-user.script b/tests/scripts/login-gobject-invalid-user.script
index a61aeafc023ff192c013ab4b23ab121404efb8b4..6dded5bfdd8c89b595cb039ee58f800ea35bc204 100644 (file)
--- a/tests/scripts/login-gobject-invalid-user.script
+++ b/tests/scripts/login-gobject-invalid-user.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,6 +25,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-logout.conf b/tests/scripts/login-gobject-logout.conf
index 1e66232cc5a9fdbeac43489b4fddf47a557ea65b..58aa488a50fb8e415bb869e0e14bbded5eb3ce84 100644 (file)
--- a/tests/scripts/login-gobject-logout.conf
+++ b/tests/scripts/login-gobject-logout.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 logout=true
 

diff --git a/tests/scripts/login-gobject-logout.script b/tests/scripts/login-gobject-logout.script
index 0178660a60de7ba1c02b37fa86a3d6065afb64a8..e6ee5c75c2db9699f36fa15aaa476f2f0ec652e0 100644 (file)
--- a/tests/scripts/login-gobject-logout.script
+++ b/tests/scripts/login-gobject-logout.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,27 +25,27 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits, session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Logout of session
 SESSION LOGOUT
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-manual.conf b/tests/scripts/login-gobject-manual.conf
index 1ff7512d3f43dbc3ec8cf1c6acf356dd8a727438..c345967d2d957c19eef6016827b6b8a0dd6064c4 100644 (file)
--- a/tests/scripts/login-gobject-manual.conf
+++ b/tests/scripts/login-gobject-manual.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 prompt-username=true
 username=alice

diff --git a/tests/scripts/login-gobject-manual.script b/tests/scripts/login-gobject-manual.script
index 3c34dbddb7bf36e42190fa640749bf349053aed8..8b32e526e58fe3835d83dc13f83c44c5fec7a561 100644 (file)
--- a/tests/scripts/login-gobject-manual.script
+++ b/tests/scripts/login-gobject-manual.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -27,12 +27,12 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits and session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-no-password.conf b/tests/scripts/login-gobject-no-password.conf
index f0032c5a57297abc4ae97f9fdfaea4dc307d8a84..bb442c44ee8b4e359535155402fe524c1a69813d 100644 (file)
--- a/tests/scripts/login-gobject-no-password.conf
+++ b/tests/scripts/login-gobject-no-password.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=bob

diff --git a/tests/scripts/login-gobject-no-password.script b/tests/scripts/login-gobject-no-password.script
index 83584b52d507a987b17c7d08360850f6d2948ea4..e3efdfb3c436d83647102f45e173d70682409172 100644 (file)
--- a/tests/scripts/login-gobject-no-password.script
+++ b/tests/scripts/login-gobject-no-password.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,12 +23,12 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Session starts
 GREETER QUIT
 SESSION START USER=bob
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-session-crash.conf b/tests/scripts/login-gobject-session-crash.conf
index 512a6fe4777fa0d9207cbb9cdc32081b61256f8e..690b8b2e1d434f5688172463e8c2fbb224a89715 100644 (file)
--- a/tests/scripts/login-gobject-session-crash.conf
+++ b/tests/scripts/login-gobject-session-crash.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 sigsegv=true
 

diff --git a/tests/scripts/login-gobject-session-crash.script b/tests/scripts/login-gobject-session-crash.script
index 9be7c04a475c3f99dbfdf22670e7c6191f09edd1..669ce1cfd3a875ff7645062cd7a57fb9965f6f64 100644 (file)
--- a/tests/scripts/login-gobject-session-crash.script
+++ b/tests/scripts/login-gobject-session-crash.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,27 +25,27 @@ GREETER QUIT
 
 # Session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Session crashes
 SESSION CRASH
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts on X server
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject-wrong-password.conf b/tests/scripts/login-gobject-wrong-password.conf
index 8f27ad261185caef6e53b22c76d0db788f90bfbf..5778c93c3dc3fd083feec974f088f2aa6ccbc045 100644 (file)
--- a/tests/scripts/login-gobject-wrong-password.conf
+++ b/tests/scripts/login-gobject-wrong-password.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=alice
 password=rubbish

diff --git a/tests/scripts/login-gobject-wrong-password.script b/tests/scripts/login-gobject-wrong-password.script
index 638d5f08d04961594c8c17ae51c0ee46d029ad55..83f68d8e1e32452af7008e8494c7f97d6dec767d 100644 (file)
--- a/tests/scripts/login-gobject-wrong-password.script
+++ b/tests/scripts/login-gobject-wrong-password.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,7 +25,7 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/login-gobject-xserver-crash.conf b/tests/scripts/login-gobject-xserver-crash.conf
index 3b7286e4ac82722b8f5db5ae3fbbfc3d426ed415..1e9fcc923790cb776745a1b0cc9dcebda42a5550 100644 (file)
--- a/tests/scripts/login-gobject-xserver-crash.conf
+++ b/tests/scripts/login-gobject-xserver-crash.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 crash-xserver=true
 

diff --git a/tests/scripts/login-gobject-xserver-crash.script b/tests/scripts/login-gobject-xserver-crash.script
index 2fded2070e472c3efc2d8a920402bf06e62d7288..4577fbd3510c487243522d2b652fcbef962f16ed 100644 (file)
--- a/tests/scripts/login-gobject-xserver-crash.script
+++ b/tests/scripts/login-gobject-xserver-crash.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # XServer starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,28 +25,28 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits, and session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
 SESSION CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # User session is terminated
 SESSION TERMINATE SIGNAL=15
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 *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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/login-gobject.conf b/tests/scripts/login-gobject.conf
index 5d207246511294f08ec2fd72179a651ec2f23a6d..e232614da6d9032a80dc14676ea669c68ecc54c4 100644 (file)
--- a/tests/scripts/login-gobject.conf
+++ b/tests/scripts/login-gobject.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=alice
 password=password

diff --git a/tests/scripts/login-gobject.script b/tests/scripts/login-gobject.script
index 53f23c8845b383d5116ae638b7977cf8ce345b76..dde89ca9ca63b505db5e3f07271b7ba897f4c88c 100644 (file)
--- a/tests/scripts/login-gobject.script
+++ b/tests/scripts/login-gobject.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,12 +25,12 @@ GREETER QUIT
 
 # Session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/no-config.script b/tests/scripts/no-config.script
index 3ca9cf4aea0b69763918a21e2893718dca7cb8bc..5cb21e3cdd3645dd2447113663a74ab5357a968d 100644 (file)
--- a/tests/scripts/no-config.script
+++ b/tests/scripts/no-config.script
@@ -5,21 +5,21 @@
 RUNNER DAEMON-START
 
 # One X server should start by default
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # A greeter should run on the X server
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER 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 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
 

diff --git a/tests/scripts/show-greeter.conf b/tests/scripts/show-greeter.conf
index dedc788b6ab0dd1de97dcbe43e37cf788c7fa7a9..e232614da6d9032a80dc14676ea669c68ecc54c4 100644 (file)
--- a/tests/scripts/show-greeter.conf
+++ b/tests/scripts/show-greeter.conf
@@ -1 +1,6 @@
 [LightDM]
+seats=test-seat
+
+[test-greeter-config]
+username=alice
+password=password

diff --git a/tests/scripts/show-greeter.script b/tests/scripts/show-greeter.script
index d03126685052b57c26aa7001659655ba8ae67e2e..986e9425ce58a77b6b75b2300785755afafef404 100644 (file)
--- a/tests/scripts/show-greeter.script
+++ b/tests/scripts/show-greeter.script
@@ -3,28 +3,52 @@
 #
 
 RUNNER DAEMON-START
-*WAIT
 
-# Show a greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
+
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Show the greeter again, should not do anything
+# Login
+GREETER LOGIN USERNAME=alice
+GREETER SHOW-PROMPT TEXT="Password:"
+GREETER RESPOND TEXT="password"
+GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+GREETER QUIT
+
+# Session starts
+SESSION START USER=alice
+XSERVER :50 ACCEPT-CONNECT
+SESSION CONNECT-XSERVER
+
+# Show the greeter
 *SHOW-GREETER
 RUNNER SHOW-GREETER
-*WAIT
+
+# New X server starts
+XSERVER :51 START
+XSERVER :51 INDICATE-READY
+XSERVER :51 ACCEPT-CONNECT
+
+# Greeter starts
+GREETER START
+XSERVER :51 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :51
+GREETER CONNECT-TO-DAEMON
+GREETER 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)
+(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)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index 0fe0d257c82f8cc0957d0fb00dbc0c0a5e4546e9..c52fc7ceb41327ab6f7dc9496809cc03f20f2686 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -1,9 +1,7 @@
 [LightDM]
+seats=test-seat
 
 [GuestAccount]
 enabled=true
 setup-script=test-setup-guest
 cleanup-script=test-cleanup-guest
-
-[test-greeter-config]
-login-guest=true

diff --git a/tests/scripts/switch-to-guest.script b/tests/scripts/switch-to-guest.script
index f0cb576ede30dc4f393f183a1ef9fc2d7f8aee38..c7db3949e440eb984160f86fac36ba6c37947087 100644 (file)
--- a/tests/scripts/switch-to-guest.script
+++ b/tests/scripts/switch-to-guest.script
@@ -5,45 +5,40 @@
 RUNNER DAEMON-START
 *WAIT
 
-# Switch to guest, should automatically log in
-*SWITCH-TO-GUEST
-RUNNER SWITCH-TO-GUEST
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
-SESSION START USER=guest
-XSERVER :.* ACCEPT-CONNECT
-SESSION CONNECT-XSERVER
-
-# Switch again, should not do anything as guest already running
-*SWITCH-TO-GUEST
-RUNNER SWITCH-TO-GUEST
-*WAIT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
-# Show a new greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Log in as guest
+# Switch to guest
+*SWITCH-TO-GUEST
+RUNNER SWITCH-TO-GUEST
+
+# Existing greeter does the action
 GREETER LOGIN-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 
-# New display should quit, and first session should be actived
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+# Greeter quits, guest session starts
+GREETER QUIT
+SESSION START USER=guest
+XSERVER :50 ACCEPT-CONNECT
+SESSION CONNECT-XSERVER
+
+# Switch again, should not do anything as guest already running
+*SWITCH-TO-GUEST
+RUNNER SWITCH-TO-GUEST
 *WAIT
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 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 d3d9e0453ba271b1f8145eafe9453493d669c35b..0b92413b7a51a762c2a42eb10291b92d48a943b5 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -1,5 +1,2 @@
 [LightDM]
-
-[test-greeter-config]
-username=alice
-password=password
+seats=test-seat

diff --git a/tests/scripts/switch-to-user.script b/tests/scripts/switch-to-user.script
index b0153d07be7d03a05ab927b7c279415c5d047883..5602000f6191561469282b85694e0048a56cd18e 100644 (file)
--- a/tests/scripts/switch-to-user.script
+++ b/tests/scripts/switch-to-user.script
@@ -5,59 +5,29 @@
 RUNNER DAEMON-START
 *WAIT
 
-# Show a greeter with alice selected
-*SWITCH-TO-USER USERNAME=alice
-RUNNER SWITCH-TO-USER USERNAME=alice
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
+
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Alice is logged in
-GREETER LOGIN USERNAME=alice
-GREETER SHOW-PROMPT TEXT="Password:"
-GREETER RESPOND TEXT="password"
-GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-GREETER QUIT
-SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
-SESSION CONNECT-XSERVER
-
-# Switch again, should not do anything as user session already running
+# Switch to Alice's account
 *SWITCH-TO-USER USERNAME=alice
 RUNNER SWITCH-TO-USER USERNAME=alice
-*WAIT
 
-# Show a new greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
-GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
-GREETER CONNECT-TO-DAEMON
-GREETER CONNECTED-TO-DAEMON
-
-# Log in as alice
+# Existing greeter does the action
 GREETER LOGIN USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
-GREETER RESPOND TEXT="password"
-GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-
-# New display should quit, and first login should be actived
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-*WAIT
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/xserver-fail-start.script b/tests/scripts/xserver-fail-start.script
index b7d9881fdec52c1ba696d937e08d29e5fa9fb586..6d6eb478ab9423e51476e0723be3780269dc3d23 100644 (file)
--- a/tests/scripts/xserver-fail-start.script
+++ b/tests/scripts/xserver-fail-start.script
@@ -2,6 +2,6 @@
 # Check that LightDM handles an X server that fails to start.
 #
 RUNNER DAEMON-START
-XSERVER :.* START
-XSERVER :.* EXIT CODE=1
+XSERVER :50 START
+XSERVER :50 EXIT CODE=1
 RUNNER DAEMON-TERMINATE SIGNAL=15