Bug 1263646 - Use disable-e10s option in mozharness scripts for firefox ui tests; r?sydpolk
MozReview-Commit-ID: GCDBiYTcAe8
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -18,18 +18,18 @@ from mozharness.base.log import FATAL, W
from mozharness.base.python import PostScriptRun, PreScriptAction
from mozharness.mozilla.structuredlog import StructuredOutputParser
from mozharness.mozilla.testing.testbase import (
TestingMixin,
testing_config_options,
)
from mozharness.mozilla.vcstools import VCSToolsScript
-# Command line arguments for firefox ui tests
-firefox_ui_tests_harness_config_options = [
+deprecated_options = [
+ # TODO update mozmill-ci jobs to use --disable-e10s instead?
[["--e10s"], {
'dest': 'e10s',
'action': 'store_true',
'default': False,
'help': 'Enable multi-process (e10s) mode when running tests.',
}],
]
@@ -49,17 +49,17 @@ firefox_ui_tests_config_options = [
'default': 'https://github.com/mozilla/firefox-ui-tests.git',
'help': 'which firefox_ui_tests repo to use',
}],
[['--symbols-path=SYMBOLS_PATH'], {
'dest': 'symbols_path',
'help': 'absolute path to directory containing breakpad '
'symbols, or the url of a zip file containing symbols.',
}],
-] + firefox_ui_tests_harness_config_options \
+] + deprecated_options \
+ copy.deepcopy(testing_config_options)
# Command line arguments for update tests
firefox_ui_update_harness_config_options = [
[['--update-allow-mar-channel'], {
'dest': 'update_allow_mar_channel',
'help': 'Additional MAR channel to be allowed for updates, e.g. '
'"firefox-mozilla-beta" for updating a release build to '
@@ -219,22 +219,21 @@ class FirefoxUITests(TestingMixin, VCSTo
for key in dirs:
if key not in abs_dirs:
abs_dirs[key] = dirs[key]
self.abs_dirs = abs_dirs
return self.abs_dirs
def query_harness_args(self, extra_harness_config_options=None):
- """Collects specific update test related command line arguments.
+ """Collects specific test related command line arguments.
Sub classes should override this method for their own specific arguments.
"""
- extra_harness_config_options = extra_harness_config_options or []
- config_options = firefox_ui_tests_harness_config_options + extra_harness_config_options
+ config_options = extra_harness_config_options or []
args = []
for option in config_options:
dest = option[1]['dest']
name = self.config.get(dest)
if name:
if type(name) is bool:
@@ -315,16 +314,20 @@ class FirefoxUITests(TestingMixin, VCSTo
# additional reports helpful for Jenkins and inpection via Treeherder
'--log-html', os.path.join(dirs["abs_reports_dir"], self.reports['html']),
'--log-xunit', os.path.join(dirs["abs_reports_dir"], self.reports['xunit']),
]
# Collect all pass-through harness options to the script
cmd.extend(self.query_harness_args())
+ # Translate deprecated --e10s flag
+ if not self.config.get('e10s'):
+ cmd.append('--disable-e10s')
+
# Set further environment settings
env = env or self.query_env()
if self.symbols_url:
cmd.extend(['--symbols-path', self.symbols_url])
if self.query_minidump_stackwalk():
env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path