From 263b4a7fe1d28d7790eef557be35241e9f775fc7 Mon Sep 17 00:00:00 2001 From: Dave Hunt Date: Fri, 7 Nov 2014 12:49:00 +0000 Subject: [PATCH] Bug 1087251 - Gather version and device information for HTML logging. r=jgraham --- .../marionette/client/marionette/runner/base.py | 14 +++++++++++++- testing/marionette/client/requirements.txt | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py index 7df55565e618..901a64716e9c 100644 --- a/testing/marionette/client/marionette/runner/base.py +++ b/testing/marionette/client/marionette/runner/base.py @@ -23,6 +23,7 @@ from mozhttpd import MozHttpd from mozlog.structured.structuredlog import get_default_logger from moztest.adapters.unit import StructuredTestRunner, StructuredTestResult from moztest.results import TestResultCollection, TestResult, relevant_line +import mozversion class MarionetteTest(TestResult): @@ -712,7 +713,18 @@ setReq.onerror = function() { for test in tests: self.add_test(test) - self.logger.suite_start(self.tests) + version_info = mozversion.get_version(binary=self.bin, + sources=self.sources, + dm_type=os.environ.get('DM_TRANS', 'adb')) + + device_info = None + if self.capabilities['device'] != 'desktop' and self.capabilities['browserName'] == 'B2G': + dm = get_dm(self.marionette) + device_info = dm.getInfo() + + self.logger.suite_start(self.tests, + version_info=version_info, + device_info=device_info) for test in self.manifest_skipped_tests: name = os.path.basename(test['path']) diff --git a/testing/marionette/client/requirements.txt b/testing/marionette/client/requirements.txt index 721059c1a91f..3d0da6d9d8b6 100644 --- a/testing/marionette/client/requirements.txt +++ b/testing/marionette/client/requirements.txt @@ -5,7 +5,7 @@ mozinfo >= 0.7 mozprocess >= 0.9 mozrunner >= 6.2 mozdevice >= 0.37 -mozlog >= 2.6 +mozlog >= 2.7 moznetwork >= 0.21 mozcrash >= 0.5 mozprofile >= 0.7