Bug 1451077 - Do not dump android emulator log in successful runs; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Thu, 05 Apr 2018 12:50:27 -0600
changeset 456899 cf8304a1e46d1689b6ab8274af119805126583d8
parent 456898 1ce779d6d8800666c086e7880f54b4158b7c727b
child 456900 cb8ded0a5654123cfe178f4d8d8b287dae58a9d5
push id153
push userfmarier@mozilla.com
push dateTue, 10 Apr 2018 02:28:40 +0000
reviewersme, test-only
bugs1451077
milestone61.0a1
Bug 1451077 - Do not dump android emulator log in successful runs; r=me,a=test-only _dump_emulator_log will still be called when the emulator fails to start.
testing/mozharness/scripts/android_emulator_unittest.py
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -821,24 +821,20 @@ class AndroidEmulatorTest(TestingMixin, 
                 parser.append_tinderboxprint_line(self.test_suite)
 
                 self.info("##### %s log ends" % self.test_suite)
 
                 if len(verify_args) > 0:
                     self.buildbot_status(tbpl_status, level=log_level)
                     self.log_verify_status(verify_args[-1], tbpl_status, log_level)
                 else:
-                    self._dump_emulator_log()
                     self.buildbot_status(tbpl_status, level=log_level)
                     self.log("The %s suite: %s ran with return status: %s" %
                              (suite_category, suite, tbpl_status), level=log_level)
 
-        if len(verify_args) > 0:
-            self._dump_emulator_log()
-
     @PostScriptAction('run-tests')
     def stop_emulator(self, action, success=None):
         '''
         Make sure that the emulator has been stopped
         '''
         self._kill_processes(self.config["emulator_process_name"])