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(-)
--- 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: