mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-11-22 21:21:30 +00:00
Fix the conditionals for the Workstation live check
Sigh, perl. Sigh, me. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
f8d78e159d
commit
ed62801202
@ -85,14 +85,14 @@ sub run {
|
|||||||
mouse_hide;
|
mouse_hide;
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935 - see
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935 - see
|
||||||
# if anaconda disappeared in the last 60 seconds...
|
# if anaconda disappeared in the last 60 seconds...
|
||||||
if (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
|
if (get_var("LIVE") && get_var("DESKTOP") eq 'gnome') {
|
||||||
last unless (check_screen "workstation_install_running", 1);
|
last unless (check_screen "workstation_install_running", 1);
|
||||||
}
|
}
|
||||||
last if (check_screen "anaconda_install_done", $interval);
|
last if (check_screen "anaconda_install_done", $interval);
|
||||||
$timeout -= $interval;
|
$timeout -= $interval;
|
||||||
}
|
}
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935
|
||||||
unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
|
unless (get_var("LIVE") && get_var("DESKTOP") eq 'gnome') {
|
||||||
assert_screen "anaconda_install_done";
|
assert_screen "anaconda_install_done";
|
||||||
}
|
}
|
||||||
# wait for transition to complete so we don't click in the sidebar
|
# wait for transition to complete so we don't click in the sidebar
|
||||||
@ -100,7 +100,7 @@ sub run {
|
|||||||
# for the memory check test, we *don't* want to leave
|
# for the memory check test, we *don't* want to leave
|
||||||
unless (get_var("MEMCHECK")) {
|
unless (get_var("MEMCHECK")) {
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1553935
|
||||||
unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
|
unless (get_var("LIVE") && get_var("DESKTOP") eq 'gnome') {
|
||||||
assert_and_click "anaconda_install_done";
|
assert_and_click "anaconda_install_done";
|
||||||
}
|
}
|
||||||
if (get_var('LIVE')) {
|
if (get_var('LIVE')) {
|
||||||
|
Loading…
Reference in New Issue
Block a user