Bug 1283065 - [mozharness] --e10s option of firefox-ui-tests is not deprecated. r=maja_zf
☠☠ backed out by ee7df8ab5beb ☠ ☠
authorHenrik Skupin <mail@hskupin.info>
Wed, 29 Jun 2016 13:49:02 +0200
changeset 303199 ed7d7a895962ca78cdad5200b052e73850c4b807
parent 303198 0c56fe904602ed999c82f46a8dde0bfac2e2ae9b
child 303200 63214a08673f5463749cc5f15230fda06ef6c5f8
push id79015
push usercbook@mozilla.com
push dateThu, 30 Jun 2016 10:51:07 +0000
treeherdermozilla-inbound@280e4ef4d764 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1283065
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1283065 - [mozharness] --e10s option of firefox-ui-tests is not deprecated. r=maja_zf MozReview-Commit-ID: HJFPwb9yapq
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
--- 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
 
-deprecated_options = [
-    # TODO update mozmill-ci jobs to use --disable-e10s instead?
+# Command line arguments for firefox ui tests
+firefox_ui_tests_harness_config_options = [
     [["--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.',
     }],
-] + deprecated_options \
+] + firefox_ui_tests_harness_config_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 '
@@ -223,17 +223,18 @@ class FirefoxUITests(TestingMixin, VCSTo
 
         return self.abs_dirs
 
     def query_harness_args(self, extra_harness_config_options=None):
         """Collects specific test related command line arguments.
 
         Sub classes should override this method for their own specific arguments.
         """
-        config_options = extra_harness_config_options or []
+        extra_harness_config_options = extra_harness_config_options or []
+        config_options = firefox_ui_tests_harness_config_options + extra_harness_config_options
 
         args = []
         for option in config_options:
             dest = option[1]['dest']
             name = self.config.get(dest)
 
             if name:
                 if type(name) is bool: