Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Give more time to match needles on exit_firefox #15381

Merged
merged 2 commits into from
Aug 19, 2022
Merged

Give more time to match needles on exit_firefox #15381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
549e080
Give more time to match needles on exit_firefox
Aug 19, 2022
1e3ef67
Increase timeouts for firefox_exit
Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/x11test.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,14 @@ sub firefox_preferences {
sub exit_firefox_common {
# Exit
send_key 'ctrl-q';
wait_still_screen 1, 2;
send_key_until_needlematch([qw(firefox-save-and-quit xterm-left-open xterm-without-focus)], "alt-f4", 3, 30);
wait_still_screen 3, 6;
send_key_until_needlematch([qw(firefox-save-and-quit xterm-left-open xterm-without-focus)], "alt-f4", 6, 30);
if (match_has_tag 'firefox-save-and-quit') {
# confirm "save&quit"
send_key "ret";
}
# wait a sec because xterm-without-focus can match while firefox is being closed
wait_still_screen 2;
wait_still_screen 3, 6;
assert_screen [qw(xterm-left-open xterm-without-focus)];
if (match_has_tag 'xterm-without-focus') {
# focus it
Expand Down