Bug 1623917 - actually call kill_and_get_minidump if talos shutdown times out, r=whimboo,perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D67638

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gijs Kruitbosch 2020-03-20 19:23:53 +00:00
parent 9ccc55c1c2
commit 3e20ed0bd0

View File

@ -158,11 +158,15 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
if proc.wait(1) is not None:
break
if proc.poll() is None:
raise TalosError(
"Browser shutdown timed out after {0} seconds, terminating"
LOG.info(
"Browser shutdown timed out after {0} seconds, killing"
" process.".format(wait_for_quit_timeout)
)
kill_and_get_minidump(context, minidump_dir)
raise TalosError(
"Browser shutdown timed out after {0} seconds, killed"
" process.".format(wait_for_quit_timeout)
)
elif reader.got_timeout:
raise TalosError('TIMEOUT: %s' % reader.timeout_message)
elif reader.got_error: