Bug 1227965 - [firefox-ui-tests] Add option to run tests with e10s mode enabled. r=armenzg DONTBUILD

testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py

@@ -23,6 +23,16 @@ from mozharness.mozilla.testing.testbase import (
 )
 from mozharness.mozilla.vcstools import VCSToolsScript
 
+# 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.',
+    }],
+]
+
 # General command line arguments for Firefox ui tests
 firefox_ui_tests_config_options = [
     [['--dry-run'], {
@@ -44,7 +54,8 @@ firefox_ui_tests_config_options = [
         'help': 'absolute path to directory containing breakpad '
                 'symbols, or the url of a zip file containing symbols.',
     }],
-] + copy.deepcopy(testing_config_options)
+] + firefox_ui_tests_harness_config_options \
+    + copy.deepcopy(testing_config_options)
 
 # Command line arguments for update tests
 firefox_ui_update_harness_config_options = [
@@ -205,12 +216,26 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
 
         return self.abs_dirs
 
-    def query_extra_cmd_args(self):
+    def query_harness_args(self, extra_harness_config_options):
         """Collects specific update test related command line arguments.
 
         Sub classes should override this method for their own specific arguments.
         """
-        return []
+        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:
+                    args.append(option[0][0])
+                else:
+                    args.extend([option[0][0], self.config[dest]])
+
+        return args
 
     def query_minidump_stackwalk(self):
         """We don't have an extracted test package available to get the manifest file.
@@ -265,7 +290,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
         ]
 
         # Collect all pass-through harness options to the script
-        cmd.extend(self.query_extra_cmd_args())
+        cmd.extend(self.query_harness_args())
 
         # Set further environment settings
         env = env or self.query_env()
@@ -315,18 +340,7 @@ class FirefoxUIUpdateTests(FirefoxUITests):
         FirefoxUITests.__init__(self, config_options=config_options,
                                 *args, **kwargs)
 
-    def query_extra_cmd_args(self):
+    def query_harness_args(self):
         """Collects specific update test related command line arguments."""
-        args = []
-
-        for option in firefox_ui_update_harness_config_options:
-            dest = option[1]['dest']
-            name = self.config.get(dest)
-
-            if name:
-                if type(name) is bool:
-                    args.append(option[0][0])
-                else:
-                    args.extend([option[0][0], self.config[dest]])
-
-        return args
+        return FirefoxUITests.query_harness_args(self,
+                                                 firefox_ui_update_harness_config_options)