Bug 1283396 - [mozharness] --e10s option of firefox-ui-tests is not deprecated. r=automatedtester draft
authorHenrik Skupin <mail@hskupin.info>
Wed, 29 Jun 2016 13:49:02 +0200
changeset 382735 b2c0cbb1947d69c41f3abf9d494d90fc3336fed5
parent 382533 89d45ec9d5aaf048aa2d227031d65c7f30022798
child 382739 d7b76fcee653e38482a3669f73ac7b726c7c6906
child 382797 aca2f62042ab364a04ae48921c15625badd398e1
push id21811
push userbmo:hskupin@gmail.com
push dateThu, 30 Jun 2016 08:33:07 +0000
reviewersautomatedtester
bugs1283396
milestone50.0a1
Bug 1283396 - [mozharness] --e10s option of firefox-ui-tests is not deprecated. r=automatedtester 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,49 +18,45 @@ 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?
-    [["--e10s"], {
-        'dest': 'e10s',
-        'action': 'store_true',
-        'default': False,
-        'help': 'Enable multi-process (e10s) mode when running tests.',
-    }],
-]
 
 # General command line arguments for Firefox ui tests
 firefox_ui_tests_config_options = [
     [['--dry-run'], {
         'dest': 'dry_run',
         'default': False,
         'help': 'Only show what was going to be tested.',
     }],
+    [["--e10s"], {
+        'dest': 'e10s',
+        'action': 'store_true',
+        'default': False,
+        'help': 'Enable multi-process (e10s) mode when running tests.',
+    }],
     [['--firefox-ui-branch'], {
         'dest': 'firefox_ui_branch',
         'help': 'which branch to use for firefox_ui_tests',
     }],
     [['--firefox-ui-repo'], {
         'dest': 'firefox_ui_repo',
         '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 \
-    + copy.deepcopy(testing_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 '
                 'the latest beta build.',