Bug 1343549 - Avoid unbound return_code errors in talos; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Wed, 01 Mar 2017 12:11:45 -0700
changeset 345354 9e8add7d25ddd5aab62500ac5e53bb5c825c4f8e
parent 345353 379093669b392384fffab147a1e7b42e835bceee
child 345355 a10bbbacbbdfc836ee3665b94abc8a80e7c92678
push id31436
push userkwierso@gmail.com
push dateThu, 02 Mar 2017 01:18:52 +0000
treeherdermozilla-central@e91de6fb2b3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1343549
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1343549 - Avoid unbound return_code errors in talos; r=jmaher
testing/talos/talos/talos_process.py
--- a/testing/talos/talos/talos_process.py
+++ b/testing/talos/talos/talos_process.py
@@ -134,16 +134,17 @@ def run_browser(command, minidump_dir, t
                     "Browser shutdown timed out after {0} seconds, terminating"
                     " process.".format(wait_for_quit_timeout)
                 )
         elif reader.got_timeout:
             raise TalosError('TIMEOUT: %s' % reader.timeout_message)
     finally:
         # this also handle KeyboardInterrupt
         # ensure early the process is really terminated
+        return_code = None
         try:
             return_code = context.kill_process()
             if return_code is None:
                 return_code = proc.wait(1)
         except:
             # Maybe killed by kill_and_get_minidump(), maybe ended?
             LOG.info("Unable to kill process")
             LOG.info(traceback.format_exc())