Bug 685934 - prevent unnecessary redownloading of build between tests, a=testonly, DONTBUILD

--HG--
extra : rebase_source : ad2bfa2701246fb769e238e6a60e4eb3a636fde0
This commit is contained in:
Jonathan Griffin 2011-09-09 10:50:40 -07:00
Родитель 5433c4438a
Коммит 23fe20370f
1 изменённых файлов: 24 добавлений и 20 удалений

Просмотреть файл

@ -69,17 +69,21 @@ class TPSTestThread(Thread):
autolog=self.autolog)
TPS.run_tests()
# Get the binary used by this TPS instance, and use it in subsequent
# ones, so it doesn't have to be re-downloaded each time.
binary = TPS.firefoxRunner.binary
# ... and then again in mobile mode
TPS = TPSTestRunner(self.extensionDir,
emailresults=self.emailresults,
testfile=self.testfile,
logfile=self.logfile,
binary=self.builddata['buildurl'],
config=self.config,
rlock=self.rlock,
mobile=True,
autolog=self.autolog)
TPS.run_tests()
TPS_mobile = TPSTestRunner(self.extensionDir,
emailresults=self.emailresults,
testfile=self.testfile,
logfile=self.logfile,
binary=binary,
config=self.config,
rlock=self.rlock,
mobile=True,
autolog=self.autolog)
TPS_mobile.run_tests()
# ... and again via the staging server, if credentials are present
stageaccount = self.config.get('stageaccount')
@ -90,13 +94,13 @@ class TPSTestThread(Thread):
if username and password and passphrase:
stageconfig = self.config.copy()
stageconfig['account'] = stageaccount.copy()
TPS = TPSTestRunner(self.extensionDir,
emailresults=self.emailresults,
testfile=self.testfile,
logfile=self.logfile,
binary=self.builddata['buildurl'],
config=stageconfig,
rlock=self.rlock,
mobile=False,
autolog=self.autolog)
TPS.run_tests()
TPS_stage = TPSTestRunner(self.extensionDir,
emailresults=self.emailresults,
testfile=self.testfile,
logfile=self.logfile,
binary=binary,
config=stageconfig,
rlock=self.rlock,
mobile=False,
autolog=self.autolog)
TPS_stage.run_tests()