Skip to content

Commit

Permalink
Auto merge of #22253 - KiChjang:fix-ssl-config, r=<try>
Browse files Browse the repository at this point in the history
Change the path for SSL configs in browser_kwargs

Fixes #22252.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22253)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 24, 2018
2 parents 7484b73 + 4fc9f3b commit 2e35e84
Showing 1 changed file with 6 additions and 1 deletion.
@@ -1,4 +1,5 @@
import os
import sys

from .base import NullBrowser, ExecutorBrowser, require_arg
from ..executors import executor_kwargs as base_executor_kwargs
Expand Down Expand Up @@ -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,
}


Expand Down

0 comments on commit 2e35e84

Please sign in to comment.