Bug 1259417 - really make talos run with addon source locally/try. r?wlach
MozReview-Commit-ID: CyXbzwcL6cE
--- a/testing/talos/talos/ffsetup.py
+++ b/testing/talos/talos/ffsetup.py
@@ -93,16 +93,20 @@ class FFSetup(object):
if type(value) is str:
value = utils.interpolate(value, webserver=webserver)
preferences[name] = value
extensions = self.browser_config['extensions'][:]
if self.test_config.get('extensions'):
extensions.append(self.test_config['extensions'])
+ if self.browser_config['develop'] or \
+ self.browser_config['branch_name'] == 'Try':
+ extensions = [os.path.dirname(i) for i in extensions]
+
profile = Profile.clone(
os.path.normpath(self.test_config['profile_path']),
self.profile_dir,
restore=False)
profile.set_preferences(preferences)
profile.addon_manager.install_addons(extensions)
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -106,18 +106,16 @@ def run_tests(config, browser_config):
# we do that to allow locally the user to have another running firefox
# instance
if browser_config['develop']:
browser_config['extra_args'] = '--no-remote'
# with addon signing for production talos, we want to develop without it
if browser_config['develop'] or browser_config['branch_name'] == 'Try':
browser_config['preferences']['xpinstall.signatures.required'] = False
- browser_config['extensions'] = [os.path.dirname(i)
- for i in browser_config['extensions']]
# set defaults
title = config.get('title', '')
testdate = config.get('testdate', '')
if browser_config['e10s'] and not title.endswith(".e"):
# we are running in e10s mode
title = "%s.e" % (title,)