Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1445716 - Support profile locations in geckoview-junit; r=jmaher

Browse Source
This commit is contained in:
Geoff Brown 2018-04-25 09:10:26 -06:00
parent bc36ecada6
commit b7021e6fbe
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testing/mochitest/runjunit.py
View File

@ -18,6 +18,7 @@ import mozlog
import moznetwork
from mozdevice import ADBAndroid
from mozprofile import Profile, Preferences, DEFAULT_PORTS
from mozprofile.permissions import ServerLocations
from runtests import MochitestDesktop, update_mozinfo
here = os.path.abspath(os.path.dirname(__file__))
@ -122,7 +123,8 @@ class JUnitTestRunner(MochitestDesktop):
'ws': self.options.sslPort
}
self.profile = Profile(preferences=prefs, proxy=proxy)
self.profile = Profile(locations=self.locations, preferences=prefs,
proxy=proxy)
self.options.profilePath = self.profile.profile
if self.fillCertificateDB(self.options):
@ -177,6 +179,14 @@ class JUnitTestRunner(MochitestDesktop):
cmd = cmd + " %s/%s" % (self.options.app, self.options.runner)
return cmd
@property
def locations(self):
if self._locations is not None:
return self._locations
locations_file = os.path.join(here, 'server-locations.txt')
self._locations = ServerLocations(locations_file)
return self._locations
def run_tests(self, test_filters=None):
"""
Run the tests.