testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Drop #1663050 workaround (fixed a while ago)

Browse Source 
This block is kinda weird, but I don't want to fiddle with it
any more right now. I don't know why we do this check_screen
exactly like this.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-01-10 14:41:41 -08:00
parent 0714143673
commit ba40ba3e4a
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/utils.pm
View File

@ -757,19 +757,10 @@ sub quit_firefox {
# expect to get to either the tabs warning or a console # expect to get to either the tabs warning or a console
if (check_screen ["user_console", "root_console", "firefox_close_tabs"], 30) { if (check_screen ["user_console", "root_console", "firefox_close_tabs"], 30) {
# if we hit the tabs warning, click it # if we hit the tabs warning, click it
assert_and_click "firefox_close_tabs" if (match_has_tag "firefox_close_tabs"); click_lastmatch if (match_has_tag "firefox_close_tabs");
} }
# FIXME workaround for RHBZ #1663050 - with systemd 240, at this # it's a bit odd if we reach here, but could mean we quit to a
# point the tty quits and we wind up back at the login prompt # desktop, or the firefox_close_tabs needle went stale...
wait_still_screen 5;
# on all paths where we hit this sub, we want to be logged in as
# root, so let's just run through console_login again. This is
# fine for older releases which don't have the bug, console_login
# will just notice we're already logged in as root and return.
# Timeout is set to 45 as sometimes it seems to take a while to
# get back to a console, e.g.
# https://openqa.stg.fedoraproject.org/tests/666186
console_login(user=>'root', timeout=>45);
} }
sub start_with_launcher { sub start_with_launcher {