Bug 1397222 - Fix running talos in developer mode on try branches. r=jmaher draft
authorAlexandre Poirot <poirot.alex@gmail.com>
Wed, 06 Sep 2017 13:58:01 +0200
changeset 661410 913a99935f4925112f964ec37ef06adeed578799
parent 660422 d8e238b811d3dc74515065ae8cab6c74baf0295f
child 730551 1fab11529bc88b2d1aaecb1fc5cea67b8c953042
push id78737
push userbmo:poirot.alex@gmail.com
push dateFri, 08 Sep 2017 10:32:28 +0000
reviewersjmaher
bugs1397222
milestone57.0a1
Bug 1397222 - Fix running talos in developer mode on try branches. r=jmaher MozReview-Commit-ID: FNQdBchveYF
testing/talos/talos/ffsetup.py
testing/talos/talos/run_tests.py
--- a/testing/talos/talos/ffsetup.py
+++ b/testing/talos/talos/ffsetup.py
@@ -89,17 +89,17 @@ class FFSetup(object):
                 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':
+           'try' in str.lower(self.browser_config['branch_name']):
             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)
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -113,17 +113,17 @@ def run_tests(config, browser_config):
 
     # pass --no-remote to firefox launch, if --develop is specified
     # 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':
+    if browser_config['develop'] or 'try' in str.lower(browser_config['branch_name']):
         browser_config['preferences']['xpinstall.signatures.required'] = False
 
     browser_config['preferences']['extensions.allow-non-mpc-extensions'] = True
 
     # if using firstNonBlankPaint, must turn on pref for it
     if test.get('fnbpaint', False):
         LOG.info("Using firstNonBlankPaint, so turning on pref for it")
         browser_config['preferences']['dom.performance.time_to_non_blank_paint.enabled'] = True