[tor-commits] [tor-browser/esr24] Bug 1035551 - Add an in-tree config for marionette tests. r=ahal, a=NPOTB

mikeperry at torproject.org mikeperry at torproject.org
Fri Aug 29 05:26:44 UTC 2014


commit 916f79ab0a7251d4ff7206cb05e80832f326d552
Author: Chris Manchester <cmanchester at mozilla.com>
Date:   Mon Jul 14 16:02:39 2014 -0400

    Bug 1035551 - Add an in-tree config for marionette tests. r=ahal, a=NPOTB
---
 testing/config/mozharness/marionette.py |   57 +++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py
new file mode 100644
index 0000000..6794bbc
--- /dev/null
+++ b/testing/config/mozharness/marionette.py
@@ -0,0 +1,57 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+config = {
+    "marionette_desktop_options": [
+        "--type=%(type)s",
+        "--log-raw=%(raw_log_file)s",
+        "--binary=%(binary)s",
+        "--address=%(address)s",
+    ],
+    "marionette_emulator_options": [
+        "--type=%(type)s",
+        "--log-raw=%(raw_log_file)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    "webapi_emulator_options": [
+        "--type=%(type)s",
+        "--log-raw=%(raw_log_file)s",
+        "--symbols-path=%(symbols_path)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    # This combination is not currently run.
+    "webapi_desktop_options": [
+    ],
+    "gaiatest_emulator_options": [
+        "--restart",
+        "--timeout=%(timeout)s",
+        "--type=%(type)s",
+        "--testvars=%(testvars)s",
+        "--profile=%(profile)s",
+        "--symbols-path=%(symbols_path)s",
+        "--xml-output=%(xml_output)s",
+        "--html-output=%(html_output)s",
+        "--log-raw=%(raw_log_file)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    "gaiatest_desktop_options": [
+        "--restart",
+        "--timeout=%(timeout)s",
+        "--type=%(type)s",
+        "--testvars=%(testvars)s",
+        "--profile=%(profile)s",
+        "--symbols-path=%(symbols_path)s",
+        "--xml-output=%(xml_output)s",
+        "--html-output=%(html_output)s",
+        "--log-raw=%(raw_log_file)s",
+        "--binary=%(binary)s",
+        "--address=%(address)s",
+    ],
+}





More information about the tor-commits mailing list