desktop_login: don't assert wrong password message on F34+

In GDM 40 the message is displayed only briefly, like in SDDM,
so we can't assert it. Only do it for <F34.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-03-10 17:00:01 -08:00
parent 37dba6adc4
commit d414ae3994

View File

@ -247,17 +247,20 @@ sub run {
# Try to log in with either account, intentionally entering the wrong password. # Try to log in with either account, intentionally entering the wrong password.
login_user(user=>"jack", password=>"wrongpassword", checklogin=>0); login_user(user=>"jack", password=>"wrongpassword", checklogin=>0);
if ($desktop eq "gnome") { my $relnum = get_release_number;
# In GDM, a message is shown about an unsuccessful login and it can be if ($desktop eq "gnome" && $relnum < 34) {
# asserted, so let's do it. In SDDM, there is also a message, but it # In GDM before F34, a message is shown about an unsuccessful login
# is only displayed for a short moment and the assertion fails here, # and it can be asserted, so let's do it. In SDDM and GDM F34+,
# so we will skip the assertion. Not being able to login in with # there is also a message, but it is only displayed for a short
# a wrong password is enough here. # moment and the assertion fails here, so we will skip the assertion.
# Not being able to login in with a wrong password is enough here.
assert_screen "login_wrong_password"; assert_screen "login_wrong_password";
send_key 'esc'; send_key 'esc';
} }
# Now, log into the system again using the correct password. # Now, log into the system again using the correct password. This will
# only work if we were correctly denied login with the wrong password,
# if we were let in with the wrong password it'll fail
login_user(user=>"jim", password=>$jimpass); login_user(user=>"jim", password=>$jimpass);
check_user_logged_in("jim"); check_user_logged_in("jim");