Bug 1533008 - Fix Raptor Chromium OSX jobs by using mock-keychain; r=davehunt a=test-only
authorRob Wood <rwood@mozilla.com>
Thu, 04 Apr 2019 14:54:38 +0000
changeset 523200 75a92a484e17
parent 523199 09e4cb94ed9e
child 523201 054c9d916b78
push id11098
push userapavel@mozilla.com
push dateTue, 16 Apr 2019 13:54:52 +0000
treeherdermozilla-beta@75a92a484e17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdavehunt, test-only
bugs1533008
milestone67.0
Bug 1533008 - Fix Raptor Chromium OSX jobs by using mock-keychain; r=davehunt a=test-only Differential Revision: https://phabricator.services.mozilla.com/D25861
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -477,26 +477,27 @@ class RaptorDesktopChrome(RaptorDesktop)
     def setup_chrome_desktop_for_playback(self):
         # if running a pageload test on google chrome, add the cmd line options
         # to turn on the proxy and ignore security certificate errors
         # if using host localhost, 127.0.0.1.
         chrome_args = [
             '--proxy-server=127.0.0.1:8080',
             '--proxy-bypass-list=localhost;127.0.0.1',
             '--ignore-certificate-errors',
-            '--no-default-browser-check',
-            '--use-mock-keychain',
         ]
         if self.config['host'] not in ('localhost', '127.0.0.1'):
             chrome_args[0] = chrome_args[0].replace('127.0.0.1', self.config['host'])
         if ' '.join(chrome_args) not in ' '.join(self.runner.cmdargs):
             self.runner.cmdargs.extend(chrome_args)
 
     def launch_desktop_browser(self, test):
         self.log.info("starting %s" % self.config['app'])
+        # some chromium-specfic cmd line opts required
+        self.runner.cmdargs.extend(['--use-mock-keychain', '--no-default-browser-check'])
+
         # if running in debug-mode, open the devtools on the raptor test tab
         if self.debug_mode:
             self.runner.cmdargs.extend(['--auto-open-devtools-for-tabs'])
 
         if test.get('playback', None) is not None:
             self.setup_chrome_desktop_for_playback()
 
         self.start_runner_proc()