Bug 1400786 - Use a startup_timeout of 180s for Marionette on all platforms. draft
authorHenrik Skupin <mail@hskupin.info>
Mon, 18 Sep 2017 10:09:35 +0200
changeset 666220 44ee0f5462c986119d4badeb186bbec13577a92f
parent 664736 dd6b788f149763c4014c27f2fe1a1d13228bda82
child 732018 7c3d5e3c29fc36848719852c34e2c854a14d66e4
push id80318
push userbmo:hskupin@gmail.com
push dateMon, 18 Sep 2017 08:12:55 +0000
bugs1400786
milestone57.0a1
Bug 1400786 - Use a startup_timeout of 180s for Marionette on all platforms. Currently only the Mochitests on Linux use a startup_timeout of 180s for Marionette. This would also be necessary for the other platforms (MacOS and Windows). MozReview-Commit-ID: TGO7XDLXdI
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_taskcluster_unittest.py
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -81,16 +81,17 @@ config = {
                 "--extra-profile-file=tests/bin/plugins",
                 "--symbols-path=%(symbols_path)s",
                 "--certificate-path=tests/certs",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--screenshot-on-fail",
                 "--cleanup-crashes",
+                "--marionette-startup-timeout=180",
                 "--work-path=%(abs_work_dir)s",
             ],
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
         "mozbase": {
             "options": [
                 "-b",
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -94,16 +94,17 @@ config = {
                 "--extra-profile-file=tests/bin/plugins",
                 "--symbols-path=%(symbols_path)s",
                 "--certificate-path=tests/certs",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--screenshot-on-fail",
                 "--cleanup-crashes",
+                "--marionette-startup-timeout=180",
             ],
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
         "mozbase": {
             "options": [
                 "-b",
                 "%(binary_path)s"