Bug 1366055 - Autophone - improve LogDecorator to allow cross branch …

…failure analysis, r=jmaher
mozilla · May 18, 2017 · a6c4b1e · a6c4b1e
1 parent e4eb7d5
commit a6c4b1e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/phonetest.py b/phonetest.py
@@ -814,11 +814,14 @@ def setup_job(self):
         logger = utils.getLogger()
         self.loggerdeco = LogDecorator(logger,
                                        {
+                                           'repo': self.build.tree,
                                            'buildid': self.build.id,
                                            'buildtype': self.build.type,
-                                           'test': self.name
+                                           'sdk': self.phone.sdk,
+                                           'platform': self.build.platform,
+                                           'testname': self.name
                                        },
-                                       'PhoneTestJob %(buildid)s %(buildtype)s %(test)s '
+                                       'PhoneTestJob %(repo)s %(buildid)s %(buildtype)s %(sdk)s %(platform)s %(testname)s '
                                        '%(message)s')
         self.dm._logger = self.loggerdeco
         self.loggerdeco.info('PhoneTest starting job')

diff --git a/tests/runtestsremote.py b/tests/runtestsremote.py
@@ -385,11 +385,14 @@ def runtest(self):
 
         self.loggerdeco = self.loggerdeco.clone(
             extradict={
+                'repo': self.build.tree,
                 'buildid': self.parms['buildid'],
                 'buildtype': self.parms['buildtype'],
+                'sdk': self.phone.sdk,
+                'platform': self.build.platform,
                 'testname': self.parms['test_name']
             },
-            extraformat='UnitTestJob %(buildid)s %(buildtype)s %(testname)s %(message)s')
+            extraformat='UnitTestJob %(repo)s %(buildid)s %(buildtype)s %(sdk)s %(platform)s %(testname)s %(message)s')
 
         self.loggerdeco.info('runtestsremote.py runtest start')
         for key in self.parms.keys():

diff --git a/tests/s1s2test.py b/tests/s1s2test.py
@@ -86,11 +86,14 @@ def run_job(self):
         for testnum, (testname, url) in enumerate(self._urls.iteritems(), 1):
             self.loggerdeco = self.loggerdeco.clone(
                 extradict={
+                    'repo': self.build.tree,
                     'buildid': self.build.id,
                     'buildtype': self.build.type,
+                    'sdk': self.phone.sdk,
+                    'platform': self.build.platform,
                     'testname': testname
                 },
-                extraformat='S1S2TestJob %(buildid)s %(buildtype)s %(testname)s %(message)s')
+                extraformat='S1S2TestJob %(repo)s %(buildid)s %(buildtype)s %(sdk)s %(platform)s %(testname)s %(message)s')
             self.dm._logger = self.loggerdeco
             self.loggerdeco.info('Running test (%d/%d) for %d iterations',
                                  testnum, testcount, self._iterations)

diff --git a/tests/talostest.py b/tests/talostest.py
@@ -119,11 +119,14 @@ def run_job(self):
         for testnum, (testname, test_args) in test_items:
             self.loggerdeco = self.loggerdeco.clone(
                 extradict={
+                    'repo': self.build.tree,
                     'buildid': self.build.id,
                     'buildtype': self.build.type,
+                    'sdk': self.phone.sdk,
+                    'platform': self.build.platform,
                     'testname': testname
                 },
-                extraformat='TalosTestJob %(buildid)s %(buildtype)s %(testname)s %(message)s')
+                extraformat='TalosTestJob %(repo)s %(buildid)s %(buildtype)s %(sdk)s %(platform)s %(testname)s %(message)s')
             self.dm._logger = self.loggerdeco
             self.loggerdeco.info('Running test (%d/%d)',
                                  testnum, testcount)