Bug 1049723 - Add log reference to Treeherder report. r=mdas

mozilla-b2g · Oct 2, 2014 · c7fc067 · c7fc067
1 parent 713c513
commit c7fc067
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/mixins/treeherder.py b/tests/python/gaia-ui-tests/gaiatest/mixins/treeherder.py
@@ -13,7 +13,8 @@
 
 import boto
 from mozdevice import ADBDevice
-from mozlog.structured.handlers import StreamHandler
+from mozlog.structured.formatters import TbplFormatter
+from mozlog.structured.handlers import LogLevelFilter, StreamHandler
 import mozversion
 import requests
 from thclient import TreeherderRequest, TreeherderJobCollection
@@ -97,7 +98,7 @@ def post_to_treeherder(self, tests):
                               'version: %s. Unable to determine Treeherder '
                               'group. Supported devices: %s'
                               % (device, device_firmware_version_release,
-                                 ['%s: %s' %(k, [fw for fw in v.keys()])
+                                 ['%s: %s' % (k, [fw for fw in v.keys()])
                                   for k, v in DEVICE_GROUP_MAP.iteritems()]))
             return
 
@@ -210,11 +211,11 @@ def post_to_treeherder(self, tests):
                     'value': filename,
                     'content_type': 'link',
                     'title': 'Log:'})
-                # TODO: Bug 1049723 - Add log reference
-                # if type(handler.formatter) is TbplFormatter or \
-                #         type(handler.formatter) is LogLevelFilter and \
-                #         type(handler.formatter.inner) is TbplFormatter:
-                #     job.add_log_reference(filename, url)
+                # Add log reference
+                if type(handler.formatter) is TbplFormatter or \
+                        type(handler.formatter) is LogLevelFilter and \
+                        type(handler.formatter.inner) is TbplFormatter:
+                    job.add_log_reference(filename, url)
             except S3UploadError:
                 job_details.append({
                     'value': 'Failed to upload %s' % filename,
@@ -223,19 +224,20 @@ def post_to_treeherder(self, tests):
 
         # Attach reports
         for report in [self.html_output, self.xml_output]:
-            filename = os.path.split(report)[-1]
-            try:
-                url = self.upload_to_s3(report)
-                job_details.append({
-                    'url': url,
-                    'value': filename,
-                    'content_type': 'link',
-                    'title': 'Report:'})
-            except S3UploadError:
-                job_details.append({
-                    'value': 'Failed to upload %s' % filename,
-                    'content_type': 'text',
-                    'title': 'Error:'})
+            if report is not None:
+                filename = os.path.split(report)[-1]
+                try:
+                    url = self.upload_to_s3(report)
+                    job_details.append({
+                        'url': url,
+                        'value': filename,
+                        'content_type': 'link',
+                        'title': 'Report:'})
+                except S3UploadError:
+                    job_details.append({
+                        'value': 'Failed to upload %s' % filename,
+                        'content_type': 'text',
+                        'title': 'Error:'})
 
         if job_details:
             job.add_artifact('Job Info', 'json', {'job_details': job_details})