Skip to content

Commit

Permalink
Bug 1033680 - TPS should use mozversion to retrieve the application d…
Browse files Browse the repository at this point in the history
…ata. r=jgriffin a=testonly DONTBUILD

---
 testing/tps/setup.py          | 1 +
 testing/tps/tps/testrunner.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
  • Loading branch information
whimboo committed Jul 3, 2014
1 parent c0691ff commit ef63ba2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions testing/tps/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'mozprocess >= 0.18',
'mozprofile >= 0.21',
'mozrunner >= 5.35',
'mozversion == 0.6',
]

# we only support python 2.6+ right now
Expand Down
3 changes: 2 additions & 1 deletion testing/tps/tps/testrunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from mozhttpd import MozHttpd
import mozinfo
from mozprofile import Profile
import mozversion

from .firefoxrunner import TPSFirefoxRunner
from .phase import TPSTestPhase
Expand Down Expand Up @@ -294,7 +295,7 @@ def run_single_test(self, testdir, testname):
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', '')
Expand Down

0 comments on commit ef63ba2

Please sign in to comment.