Soft fail workaround the 'upgrade hangs at end' bug (#1674045)
We want to get accurate results from the rest of the upgrade test and we know about this bug, so let's make it a soft fail so we can see how the test is functioning otherwise. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
f3caa1fc53
commit
86fe913b84
29
lib/utils.pm
29
lib/utils.pm
@ -61,7 +61,19 @@ sub boot_to_login_screen {
|
||||
sleep 5;
|
||||
$count -= 1;
|
||||
}
|
||||
assert_screen "login_screen", $args{timeout};
|
||||
assert_screen ["login_screen", "upgrade_complete"], $args{timeout};
|
||||
if (match_has_tag "upgrade_complete") {
|
||||
# this is a workaround for RHBZ #1674045 during upgrades
|
||||
# let's check we didn't just happen to catch it for the
|
||||
# brief time it's displayed normally...
|
||||
sleep 10;
|
||||
if (check_screen "upgrade_complete") {
|
||||
record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
|
||||
power 'reset';
|
||||
}
|
||||
# now let's just assume we'll get to a graphical login screen soonish
|
||||
assert_screen "login_screen", 300;
|
||||
}
|
||||
if (match_has_tag "graphical_login") {
|
||||
wait_still_screen 10, 30;
|
||||
assert_screen "login_screen";
|
||||
@ -275,7 +287,20 @@ sub do_bootloader {
|
||||
sub boot_decrypt {
|
||||
# decrypt storage during boot; arg is timeout (in seconds)
|
||||
my $timeout = shift || 60;
|
||||
assert_screen "boot_enter_passphrase", $timeout;
|
||||
assert_screen ["boot_enter_passphrase", "upgrade_complete"], $timeout;
|
||||
if (match_has_tag "upgrade_complete") {
|
||||
# this is a workaround for RHBZ #1674045 during upgrades
|
||||
# let's check we didn't just happen to catch it for the
|
||||
# brief time it's displayed normally...
|
||||
sleep 10;
|
||||
if (check_screen "upgrade_complete") {
|
||||
record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
|
||||
power 'reset';
|
||||
}
|
||||
# now let's just assume we'll get to a graphical login screen soonish
|
||||
assert_screen "boot_enter_passphrase", 300;
|
||||
}
|
||||
|
||||
type_string get_var("ENCRYPT_PASSWORD");
|
||||
send_key "ret";
|
||||
}
|
||||
|
15
needles/console/upgrade_complete-graphical-20190305.json
Normal file
15
needles/console/upgrade_complete-graphical-20190305.json
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 8,
|
||||
"ypos": 10,
|
||||
"width": 159,
|
||||
"height": 20,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"upgrade_complete"
|
||||
]
|
||||
}
|
BIN
needles/console/upgrade_complete-graphical-20190305.png
Normal file
BIN
needles/console/upgrade_complete-graphical-20190305.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
15
needles/console/upgrade_complete-text-20190305.json
Normal file
15
needles/console/upgrade_complete-text-20190305.json
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 321,
|
||||
"ypos": 369,
|
||||
"width": 137,
|
||||
"height": 16,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"upgrade_complete"
|
||||
]
|
||||
}
|
BIN
needles/console/upgrade_complete-text-20190305.png
Normal file
BIN
needles/console/upgrade_complete-text-20190305.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 640 B |
Loading…
Reference in New Issue
Block a user