Commits

Anonymous committed 94eb765

Just instantiate ReadOnlyDict directly

Comments (0)

Files changed (2)

configs/b2g/emulator_test_config.py

                                           #             xpcshell: "tests/xpcshell_b2g.ini"
     "total_chunks": 1,
     "this_chunk": 1,
+    
+    # test harness options
+    "run_file_names": {
+        "mochitest": "runtestsb2g.py",
+        "reftest": "runreftestb2g.py",
+        "xpcshell": "runtestsb2g.py"
+    },
+
+    "mochitest_options": [
+        "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--console-level=INFO",
+        "--emulator=%(emulator)s", "--logcat-dir=%(logcat_dir)s",
+        "--remote-webserver=%(remote_webserver)s", "--test-manifest=%(test_manifest)s",
+        "--xre-path=%(xre_path)s"],
+
+    "reftest_options": [
+        "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s",
+        "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s",
+        "--remote-webserver=%(remote_webserver)s", "--ignore-window-size",
+        "--xre-path=%(xre_path)s", "%(test_manifest)s"],
+
+    "xpcshell_options": [
+        "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s",
+        "--logcat-dir=%(logcat_dir)s", "--manifest=%(test_manifest)s",
+        "--testing-modules-dir=%(modules_dir)s"],
 }

mozharness/mozilla/testing/testbase.py

 import os
 import platform
 
-from mozharness.base.config import BaseConfig, parse_config_file
+from mozharness.base.config import ReadOnlyDict, parse_config_file
 from mozharness.base.errors import BaseErrorList
 from mozharness.base.log import FATAL
 from mozharness.base.python import virtualenv_config_options, VirtualenvMixin
                                     os.path.join(dirs['abs_work_dir'], 'tests'))
         tree_config_path = os.path.join(test_install_dir, 'config', 'mozharness_config.py')
         if os.path.isfile(tree_config_path):
-            rw_config = BaseConfig(config=self.config.copy(), args=[])
-            rw_config.set_config(parse_config_file(tree_config_path))
-            self.config = rw_config.get_read_only_config()
+            rw_config = self.config.copy()
+            rw_config.update(parse_config_file(tree_config_path))
+            self.config = ReadOnlyDict(rw_config)
+            self.config.lock()
 
     def _download_installer(self):
         file_name = None
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.