Bug 1218453 - Only check for TALOSDATA if harness exited successfully;r=jlund, a=test-only
authorWilliam Lachance <wlachance@mozilla.com>
Wed, 28 Oct 2015 13:59:36 -0400
changeset 305748 8036c2f9c76d73ff6496dabc93e4ed1319ba3222
parent 305747 84030b7af73ef8bfbf7f02df0289c29c9c25f34e
child 305749 3b6903259d21ce7766c4e33bd0c5467e67d2ccf9
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund, test-only
bugs1218453
milestone44.0a2
Bug 1218453 - Only check for TALOSDATA if harness exited successfully;r=jlund, a=test-only
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -350,28 +350,28 @@ class Talos(TestingMixin, MercurialScrip
         self.return_code = self.run_command(command, cwd=self.workdir,
                                             output_timeout=output_timeout,
                                             output_parser=parser,
                                             env=env)
         if parser.minidump_output:
             self.info("Looking at the minidump files for debugging purposes...")
             for item in parser.minidump_output:
                 self.run_command(["ls", "-l", item])
-        if parser.num_times_found_talosdata != 1:
-            self.critical("TALOSDATA was seen %d times, expected 1."
-                          % parser.num_times_found_talosdata)
-            parser.update_worst_log_and_tbpl_levels(WARNING, TBPL_WARNING)
 
         if self.return_code not in [0]:
             # update the worst log level and tbpl status
             log_level = ERROR
             tbpl_level = TBPL_FAILURE
             if self.return_code == 1:
                 log_level = WARNING
                 tbpl_level = TBPL_WARNING
             if self.return_code == 4:
                 log_level = WARNING
                 tbpl_level = TBPL_RETRY
 
             parser.update_worst_log_and_tbpl_levels(log_level, tbpl_level)
+        elif parser.num_times_found_talosdata != 1:
+            self.critical("TALOSDATA was seen %d times, expected 1."
+                          % parser.num_times_found_talosdata)
+            parser.update_worst_log_and_tbpl_levels(WARNING, TBPL_WARNING)
 
         self.buildbot_status(parser.worst_tbpl_status,
                              level=parser.worst_log_level)