From c4fe0dee074d971e4e28ab8de17bfa3c19ea322b Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Thu, 22 Nov 2018 13:42:21 -0800 Subject: [PATCH] Change the path for SSL configs in browser_kwargs --- tests/wpt/metadata/MANIFEST.json | 2 +- .../tools/wptrunner/wptrunner/browsers/servo.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index f8fe29e74eaa1..e8750445fa39a 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -665395,7 +665395,7 @@ "support" ], "tools/wptrunner/wptrunner/browsers/servo.py": [ - "1a357a3ced93edf8f65b21dde8f04b08849a4669", + "faf907f1d20f47df29ba38b5867f8c5e6f8e6129", "support" ], "tools/wptrunner/wptrunner/browsers/servodriver.py": [ diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py index 1a357a3ced93e..faf907f1d20f4 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py @@ -1,4 +1,5 @@ import os +import sys from .base import NullBrowser, ExecutorBrowser, require_arg from ..executors import executor_kwargs as base_executor_kwargs @@ -28,12 +29,16 @@ def check_args(**kwargs): def browser_kwargs(test_type, run_info_data, config, **kwargs): + if sys.platform == 'win32': + ca_cert_path = config.ssl["pregenerated"]["ca_cert_path"] + else: + ca_cert_path = config.ssl_config["ca_cert_path"] return { "binary": kwargs["binary"], "debug_info": kwargs["debug_info"], "binary_args": kwargs["binary_args"], "user_stylesheets": kwargs.get("user_stylesheets"), - "ca_certificate_path": config.ssl_config["ca_cert_path"], + "ca_certificate_path": ca_cert_path, }