Replace check_shutdown with assert_shutdown

The power_off function in desktop_login was not really asserting/checking
whether the VM got turned off. However, os-autoinst supports checking whether
the VM is turned off via assert_shutdown. This is additionally much more useful
than using check_shutdown, which does nothing if the VM is still running.
This commit is contained in:
Dan Čermák 2021-07-21 10:04:36 +02:00 committed by adamwill
parent 5ed8e33b75
commit 4811ad3fae
1 changed files with 2 additions and 4 deletions

View File

@ -180,15 +180,14 @@ sub reboot_system {
} }
sub power_off { sub power_off {
# Powers-off the machine. I am not sure if this is not a useless thing to # Powers-off the machine.
# do, because at the moment I do not know about a possibility to assert a
# switched-off VM.
assert_and_click "system_menu_button"; assert_and_click "system_menu_button";
# in KDE since F34, there's no submenu to access, the button is right here # in KDE since F34, there's no submenu to access, the button is right here
assert_screen ["power_entry", "power_off_entry"]; assert_screen ["power_entry", "power_off_entry"];
click_lastmatch; click_lastmatch;
assert_and_click "power_off_entry" if (match_has_tag("power_entry")); assert_and_click "power_off_entry" if (match_has_tag("power_entry"));
assert_and_click "power_off_confirm"; assert_and_click "power_off_confirm";
assert_shutdown;
} }
sub run { sub run {
@ -311,7 +310,6 @@ sub run {
} }
# Power off the machine # Power off the machine
power_off(); power_off();
check_shutdown;
} }
sub test_flags { sub test_flags {