From 37dba6adc4c30c4d50d61f606632b95ea58ecb0a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 16:14:43 -0800 Subject: [PATCH] Hit 'esc' rather than 'ret' to clear SDDM screensaver state OK, extending the timeout didn't work. Try this instead. The problem is when GNOME takes a long time to log out we wrongly decide we're in the "DM is showing a 'screensaver' state" case and hit 'ret' to clear it. In GDM that selects the highlighted user. Maybe if we use 'esc', it'll still work in SDDM to clear the screensaver state, but not select the first user in the list in GDM... Signed-off-by: Adam Williamson --- tests/desktop_login.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/desktop_login.pm b/tests/desktop_login.pm index d897efe7..bc548903 100644 --- a/tests/desktop_login.pm +++ b/tests/desktop_login.pm @@ -73,8 +73,8 @@ sub login_user { if (!check_screen "login_$user") { # Sometimes, especially in SDDM, we do not get the user list # but rather a "screensaver" screen for the DM. If this is the - # case, hit Enter to bring back the user list. - send_key "ret"; + # case, hit Escape to bring back the user list. + send_key "esc"; wait_still_screen 5; } if ($method ne "unlock") { @@ -119,7 +119,7 @@ sub logout_user { assert_and_click "leave_button"; assert_and_click "log_out_entry"; assert_and_click "log_out_confirm"; - wait_still_screen 20; + wait_still_screen 5; sleep 10; }