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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-03-10 16:14:43 -08:00
parent ff585d8147
commit 37dba6adc4

View File

@ -73,8 +73,8 @@ sub login_user {
if (!check_screen "login_$user") { if (!check_screen "login_$user") {
# Sometimes, especially in SDDM, we do not get the user list # Sometimes, especially in SDDM, we do not get the user list
# but rather a "screensaver" screen for the DM. If this is the # but rather a "screensaver" screen for the DM. If this is the
# case, hit Enter to bring back the user list. # case, hit Escape to bring back the user list.
send_key "ret"; send_key "esc";
wait_still_screen 5; wait_still_screen 5;
} }
if ($method ne "unlock") { if ($method ne "unlock") {
@ -119,7 +119,7 @@ sub logout_user {
assert_and_click "leave_button"; assert_and_click "leave_button";
assert_and_click "log_out_entry"; assert_and_click "log_out_entry";
assert_and_click "log_out_confirm"; assert_and_click "log_out_confirm";
wait_still_screen 20; wait_still_screen 5;
sleep 10; sleep 10;
} }