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

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

diff --git a/tests/scripts/switch-to-user.script b/tests/scripts/switch-to-user.script
index 5602000f6191561469282b85694e0048a56cd18e..f2d926132a68a32a1ac93277ae5b62e0458bdbf3 100644 (file)
--- a/tests/scripts/switch-to-user.script
+++ b/tests/scripts/switch-to-user.script
@@ -21,13 +21,29 @@ GREETER CONNECTED-TO-DAEMON
 *SWITCH-TO-USER USERNAME=alice
 RUNNER SWITCH-TO-USER USERNAME=alice
 
-# Existing greeter does the action
-GREETER LOGIN USERNAME=alice
+# Existing X server and greeter stops
+XSERVER :50 TERMINATE SIGNAL=15
+GREETER TERMINATE SIGNAL=15
+
+# New X server starts
+XSERVER :51 START
+XSERVER :51 INDICATE-READY
+XSERVER :51 ACCEPT-CONNECT
+
+# New greeter starts
+GREETER START
+XSERVER :51 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :51
+GREETER CONNECT-TO-DAEMON
+GREETER CONNECTED-TO-DAEMON
+
+# Alice is automatically selected
+GREETER LOGIN-SELECTED USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0