Bug 1033680 - TPS should use mozversion to retrieve the application data. r=jgriffin a=testonly DONTBUILD
authorHenrik Skupin <mail@hskupin.info>
Thu, 03 Jul 2014 07:27:06 +0200
changeset 228654 f75a2798a9dfac843fcf8643e18267cd7f781803
parent 228653 21eafc27992fe96c4bce0c230cd57d87aea4b290
child 228655 6e3dd1ab9b873b2ec541bf2533322e47c8127142
push id6
push userryanvm@gmail.com
push dateMon, 12 Jan 2015 22:04:06 +0000
treeherdermozilla-b2g37_v2_2@895c8fc7b734 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin, testonly
bugs1033680
milestone32.0a2
Bug 1033680 - TPS should use mozversion to retrieve the application data. r=jgriffin a=testonly DONTBUILD --- testing/tps/setup.py | 1 + testing/tps/tps/testrunner.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
testing/tps/setup.py
testing/tps/tps/testrunner.py
--- a/testing/tps/setup.py
+++ b/testing/tps/setup.py
@@ -10,16 +10,17 @@ version = '0.5'
 deps = ['httplib2 >= 0.7.3',
         'mozfile >= 1.1',
         'mozhttpd >= 0.7',
         'mozinfo >= 0.7',
         'mozinstall >= 1.9',
         'mozprocess >= 0.18',
         'mozprofile >= 0.21',
         'mozrunner >= 5.35',
+        'mozversion == 0.6',
        ]
 
 # we only support python 2.6+ right now
 assert sys.version_info[0] == 2
 assert sys.version_info[1] >= 6
 
 setup(name='tps',
       version=version,
--- a/testing/tps/tps/testrunner.py
+++ b/testing/tps/tps/testrunner.py
@@ -9,16 +9,17 @@ import random
 import re
 import tempfile
 import time
 import traceback
 
 from mozhttpd import MozHttpd
 import mozinfo
 from mozprofile import Profile
+import mozversion
 
 from .firefoxrunner import TPSFirefoxRunner
 from .phase import TPSTestPhase
 
 
 class TempFile(object):
     """Class for temporary files that delete themselves when garbage-collected.
     """
@@ -289,17 +290,17 @@ class TPSTestRunner(object):
         result = {
           'PASS': lambda x: ('TEST-PASS', ''),
           'FAIL': lambda x: ('TEST-UNEXPECTED-FAIL', x.rstrip()),
           'unknown': lambda x: ('TEST-UNEXPECTED-FAIL', 'test did not complete')
         } [phase.status](phase.errline)
         logstr = "\n%s | %s%s\n" % (result[0], testname, (' | %s' % result[1] if result[1] else ''))
 
         try:
-            repoinfo = self.firefoxRunner.runner.get_repositoryInfo()
+            repoinfo = mozversion.get_version(self.binary)
         except:
             repoinfo = {}
         apprepo = repoinfo.get('application_repository', '')
         appchangeset = repoinfo.get('application_changeset', '')
 
         # save logdata to a temporary file for posting to the db
         tmplogfile = None
         if logdata: