Remove the ill-thought-out select-user and select-guest signals. Get the greeter...

[sojka/lightdm.git] / tests / scripts / switch-to-guest.script

diff --git a/tests/scripts/switch-to-guest.script b/tests/scripts/switch-to-guest.script
index c7db3949e440eb984160f86fac36ba6c37947087..f24a58f49d8fbe3d59e994238aebed89ba8d23d1 100644 (file)
--- a/tests/scripts/switch-to-guest.script
+++ b/tests/scripts/switch-to-guest.script
@@ -21,14 +21,18 @@ GREETER CONNECTED-TO-DAEMON
 *SWITCH-TO-GUEST
 RUNNER SWITCH-TO-GUEST
 
-# Existing greeter does the action
-GREETER LOGIN-GUEST
-GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+# Existing X server and greeter stops
+XSERVER :50 TERMINATE SIGNAL=15
+GREETER TERMINATE SIGNAL=15
 
-# Greeter quits, guest session starts
-GREETER QUIT
+# New X server starts
+XSERVER :51 START
+XSERVER :51 INDICATE-READY
+XSERVER :51 ACCEPT-CONNECT
+
+# Guest session starts
 SESSION START USER=guest
-XSERVER :50 ACCEPT-CONNECT
+XSERVER :51 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Switch again, should not do anything as guest already running
@@ -39,6 +43,6 @@ RUNNER SWITCH-TO-GUEST
 # 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 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0