Bug 1259417 - really make talos run with addon source locally/try. r?wlach draft
authorJoel Maher <jmaher@mozilla.com>
Thu, 24 Mar 2016 06:39:31 -0700
changeset 344347 b12dcca679af47d0eee8c7e3a34f11456571d247
parent 344346 05cf733d5b26369caeca4550a0d33e9fd099b622
child 516932 4c29f4ddcf9f8d625e1a3ebecad33da1ad437c05
push id13800
push userjmaher@mozilla.com
push dateThu, 24 Mar 2016 13:39:49 +0000
reviewerswlach
bugs1259417
milestone48.0a1
Bug 1259417 - really make talos run with addon source locally/try. r?wlach MozReview-Commit-ID: CyXbzwcL6cE
testing/talos/talos/ffsetup.py
testing/talos/talos/run_tests.py
--- 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,)