Bug 1315522 - Marionette command-line option --addon does not work; r=automatedtester
authorMaja Frydrychowicz <mjzffr@gmail.com>
Mon, 07 Nov 2016 11:17:41 -0500
changeset 321587 b8386ff9818fd5682b32a4ea8e0a516c9d78d586
parent 321586 c05a3ad32d21c1707f37f5dfd4e98ec6fb148d84
child 321588 476aca2782fef12f2cec84e2d68254716f1d1c56
push id83647
push userkwierso@gmail.com
push dateTue, 08 Nov 2016 22:08:41 +0000
treeherdermozilla-inbound@1d0b02250149 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1315522
milestone52.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 1315522 - Marionette command-line option --addon does not work; r=automatedtester MozReview-Commit-ID: 90osifz30nl
testing/marionette/harness/marionette/runner/base.py
testing/marionette/harness/marionette/tests/harness_unit/conftest.py
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -291,16 +291,17 @@ class BaseMarionetteArguments(ArgumentPa
                           help="A preference to set. Must be a key-value pair separated by a ':'.")
         self.add_argument('--preferences',
                           action='append',
                           dest='prefs_files',
                           help="read preferences from a JSON or INI file. For INI, use "
                                "'file.ini:section' to specify a particular section.")
         self.add_argument('--addon',
                           action='append',
+                          dest='addons',
                           help="addon to install; repeat for multiple addons.")
         self.add_argument('--repeat',
                           type=int,
                           default=0,
                           help='number of times to repeat the test(s)')
         self.add_argument('--testvars',
                           action='append',
                           help='path to a json file with any test data required')
--- a/testing/marionette/harness/marionette/tests/harness_unit/conftest.py
+++ b/testing/marionette/harness/marionette/tests/harness_unit/conftest.py
@@ -22,17 +22,17 @@ def logger():
 @pytest.fixture
 def mach_parsed_kwargs(logger):
     """
     Parsed and verified dictionary used during simplest
     call to mach marionette-test
     """
     return {
         'adb_path': None,
-        'addon': None,
+        'addons': None,
         'address': None,
         'app': None,
         'app_args': [],
         'avd': None,
         'avd_home': None,
         'binary': u'/path/to/firefox',
         'browsermob_port' : None,
         'browsermob_script' : None,