1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-23 18:53:08 +00:00

Tweak text_console_login match area

On Rawhide Cloud_Base boots, there's some SSH key and network
information printed above the 'login:' prompt, so we can't
expect empty space there. Also tweak console_login() to clear
the screen after logging in, so the login prompt is cleared and
doesn't confuse things on subsequent runs (like it did first
time we tried this). And add a new user logged in needle, as it
seems after we clear the screen the tilde appears in a slightly
different position and the existing needle doesn't match.

https://openqa.fedoraproject.org/tests/489003#step/_console_wait_login/7

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-11-26 08:26:27 -08:00
parent 411f0d34e7
commit e8802935f9
4 changed files with 26 additions and 4 deletions

View File

@ -237,6 +237,9 @@ sub console_login {
assert_screen [$good, 'console_password_required'], 30;
# on a live image, just the user name will be enough
if (match_has_tag $good) {
# clear the screen (so the remaining login prompt text doesn't
# confuse subsequent runs of this)
type_string "clear\n";
_console_login_finish();
return;
}
@ -262,6 +265,9 @@ sub console_login {
$timeout = 90 if (get_var("ARCH") eq "aarch64");
assert_screen($good, $timeout);
}
# clear the screen (so the remaining login prompt text doesn't
# confuse subsequent runs of this)
type_string "clear\n";
}
_console_login_finish();
}

View File

@ -1,11 +1,11 @@
{
"area": [
{
"height": 30,
"height": 15,
"type": "match",
"width": 56,
"width": 61,
"xpos": 72,
"ypos": 49
"ypos": 64
}
],
"properties": [],
@ -15,4 +15,4 @@
"ENV-DISTRI-fedora",
"ENV-FLAVOR-develop"
]
}
}

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 14,
"xpos": 246,
"ypos": 0,
"width": 27,
"type": "match"
}
],
"properties": [],
"tags": [
"user_logged_in",
"user_console"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B