Bug 1462182 - Dump less device info during Android test-verify; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Thu, 17 May 2018 16:19:02 -0600
changeset 418786 94304ecaaadf
parent 418785 8fe97d20da6f
child 418787 fb806e16195a
push id34013
push userdluca@mozilla.com
push date2018-05-18 09:56 +0000
treeherdermozilla-central@11ee70f24ea5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1462182
milestone62.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 1462182 - Dump less device info during Android test-verify; r=jmaher
layout/tools/reftest/remotereftest.py
testing/mochitest/runtestsremote.py
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -417,33 +417,33 @@ def run_test_harness(parser, options):
     reftest.killNamedProc('ssltunnel')
     reftest.killNamedProc('xpcshell')
 
     # Start the webserver
     retVal = reftest.startWebServer(options)
     if retVal:
         return retVal
 
-    if options.printDeviceInfo:
+    if options.printDeviceInfo and not options.verify:
         reftest.printDeviceInfo()
 
     retVal = 0
     try:
         if options.verify:
             retVal = reftest.verifyTests(options.tests, options)
         else:
             retVal = reftest.runTests(options.tests, options)
     except Exception:
         print "Automation Error: Exception caught while running tests"
         traceback.print_exc()
         retVal = 1
 
     reftest.stopWebServer(options)
 
-    if options.printDeviceInfo:
+    if options.printDeviceInfo and not options.verify:
         reftest.printDeviceInfo(printLogcat=True)
 
     return retVal
 
 
 if __name__ == "__main__":
     parser = reftestcommandline.RemoteArgumentsParser()
     options = parser.parse_args()
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -335,17 +335,17 @@ def run_test_harness(parser, options):
     options.runByManifest = True
     # roboextender is used by mochitest-chrome tests like test_java_addons.html,
     # but not by any plain mochitests
     if options.flavor != 'chrome':
         options.extensionsToExclude.append('roboextender@mozilla.org')
 
     mochitest = MochiRemote(options)
 
-    if options.log_mach is None:
+    if options.log_mach is None and not options.verify:
         mochitest.printDeviceInfo()
 
     try:
         if options.verify:
             retVal = mochitest.verifyTests(options)
         else:
             retVal = mochitest.runTests(options)
     except Exception:
@@ -353,17 +353,17 @@ def run_test_harness(parser, options):
         traceback.print_exc()
         try:
             mochitest.cleanup(options)
         except Exception:
             # device error cleaning up... oh well!
             traceback.print_exc()
         retVal = 1
 
-    if options.log_mach is None:
+    if options.log_mach is None and not options.verify:
         mochitest.printDeviceInfo(printLogcat=True)
 
     mochitest.message_logger.finish()
 
     return retVal
 
 
 def main(args=sys.argv[1:]):