mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-24 23:03:08 +00:00
Drop unused branch and needle in desktop_login
We never hit this path without a system menu button any more, due to changes in KDE over time. It hasn't been hit for two years. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
3e6e80ca87
commit
1effed1069
@ -1,15 +0,0 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 38,
|
||||
"type": "match",
|
||||
"width": 39,
|
||||
"xpos": 449,
|
||||
"ypos": 610
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"reboot_icon"
|
||||
]
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 34 KiB |
@ -144,22 +144,14 @@ sub switch_user {
|
||||
}
|
||||
|
||||
sub reboot_system {
|
||||
# Reboots the system and handles everything until the next GDM screen.
|
||||
if (check_screen "system_menu_button") {
|
||||
# In a logged in desktop, we access power options through system menu
|
||||
assert_and_click "system_menu_button";
|
||||
# In KDE the reboot entry is right here, on GNOME we need to
|
||||
# enter some kind of power option submenu.
|
||||
assert_screen ["power_entry", "reboot_entry"];
|
||||
click_lastmatch;
|
||||
assert_and_click "reboot_entry" if (match_has_tag("power_entry"));
|
||||
assert_and_click "restart_confirm";
|
||||
}
|
||||
# When we are outside KDE (not logged in), the only way to reboot is to click
|
||||
# the reboot icon.
|
||||
else {
|
||||
assert_and_click "reboot_icon";
|
||||
}
|
||||
# Reboots the system and handles everything until the next login screen.
|
||||
assert_and_click "system_menu_button";
|
||||
# In KDE the reboot entry is right here, on GNOME we need to
|
||||
# enter some kind of power option submenu.
|
||||
assert_screen ["power_entry", "reboot_entry"];
|
||||
click_lastmatch;
|
||||
assert_and_click "reboot_entry" if (match_has_tag("power_entry"));
|
||||
assert_and_click "restart_confirm";
|
||||
boot_to_login_screen();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user