Bug 1517178 - [raptor] disable adb verbose output during logcat collection, r=rwood.
authorBob Clary <bclary@bclary.com>
Thu, 31 Jan 2019 20:35:56 -0800
changeset 456394 cc31e621f479b1d45d21df05030ec73ea6254884
parent 456393 9287ec4e4115073524a29cb04e8417aeac72dbf1
child 456395 3feead6581fcbfdcd9e82e0c2efc978486268dc9
push id19
push usermdeboer@mozilla.com
push dateFri, 01 Feb 2019 10:05:45 +0000
reviewersrwood
bugs1517178
milestone67.0a1
Bug 1517178 - [raptor] disable adb verbose output during logcat collection, r=rwood.
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -479,17 +479,21 @@ class Raptor(object):
         self.config['raptor_json_path'] = raptor_json_path
         return self.results_handler.summarize_and_output(self.config, test_names)
 
     def get_page_timeout_list(self):
         return self.results_handler.page_timeout_list
 
     def check_for_crashes(self):
         if self.config['app'] in ["geckoview", "fennec"]:
+            # Turn off verbose to prevent logcat from being inserted into the main log.
+            verbose = self.device._verbose
+            self.device._verbose = False
             logcat = self.device.get_logcat()
+            self.device._verbose = verbose
             if logcat:
                 if mozcrash.check_for_java_exception(logcat, "raptor"):
                     return
             try:
                 dump_dir = tempfile.mkdtemp()
                 remote_dir = posixpath.join(self.device_profile, 'minidumps')
                 if not self.device.is_dir(remote_dir):
                     self.log.error("No crash directory (%s) found on remote device" % remote_dir)