Bug 990797 - TPS CI errors out when trying to e-mail results. r=jgriffin a=lsblakk DONTBUILD
authorHenrik Skupin <mail@hskupin.info>
Wed, 02 Apr 2014 20:54:07 +0200
changeset 192581 018483c2e162f13efe7428eb311931e2f708b7d6
parent 192580 2356542e1b84a53f0835926011a13d5eb9d77c16
child 192582 b6874dec644d34f00f159f930e71c656557c2eff
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin, lsblakk
bugs990797
milestone30.0a2
Bug 990797 - TPS CI errors out when trying to e-mail results. r=jgriffin a=lsblakk DONTBUILD
testing/tps/tps/testrunner.py
--- a/testing/tps/tps/testrunner.py
+++ b/testing/tps/tps/testrunner.py
@@ -98,18 +98,18 @@ class TPSTestRunner(object):
         'services.sync.log.logger.identity': 'Trace',
         'services.sync.log.logger.userapi': 'Trace',
     }
 
     syncVerRe = re.compile(
         r'Sync version: (?P<syncversion>.*)\n')
     ffVerRe = re.compile(
         r'Firefox version: (?P<ffver>.*)\n')
-    ffDateRe = re.compile(
-        r'Firefox builddate: (?P<ffdate>.*)\n')
+    ffBuildIDRe = re.compile(
+        r'Firefox buildid: (?P<ffbuildid>.*)\n')
 
     def __init__(self, extensionDir,
                  binary=None,
                  config=None,
                  debug=False,
                  ignore_unused_engines=False,
                  logfile='tps.log',
                  mobile=False,
@@ -272,18 +272,18 @@ class TPSTestRunner(object):
 
         # grep the log for FF and sync versions
         f = open(self.logfile)
         logdata = f.read()
         match = self.syncVerRe.search(logdata)
         sync_version = match.group('syncversion') if match else 'unknown'
         match = self.ffVerRe.search(logdata)
         firefox_version = match.group('ffver') if match else 'unknown'
-        match = self.ffDateRe.search(logdata)
-        firefox_builddate = match.group('ffdate') if match else 'unknown'
+        match = self.ffBuildIDRe.search(logdata)
+        firefox_buildid = match.group('ffbuildid') if match else 'unknown'
         f.close()
         if phase.status == 'PASS':
             logdata = ''
         else:
             # we only care about the log data for this specific test
             logdata = logdata[logdata.find('Running test %s' % (str(testname))):]
 
         result = {
@@ -304,18 +304,18 @@ class TPSTestRunner(object):
         tmplogfile = None
         if logdata:
             tmplogfile = TempFile(prefix='tps_log_')
             tmplogfile.write(logdata)
             tmplogfile.close()
             self.errorlogs[testname] = tmplogfile
 
         resultdata = ({ 'productversion': { 'version': firefox_version,
-                                            'buildid': firefox_builddate,
-                                            'builddate': firefox_builddate[0:8],
+                                            'buildid': firefox_buildid,
+                                            'builddate': firefox_buildid[0:8],
                                             'product': 'Firefox',
                                             'repository': apprepo,
                                             'changeset': appchangeset,
                                           },
                         'addonversion': { 'version': sync_version,
                                           'product': 'Firefox Sync' },
                         'name': testname,
                         'message': result[1],