Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default paths for WPT tests #23174

Merged
merged 2 commits into from Apr 7, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -20,7 +20,11 @@ def servo_path(*args):
return os.path.join(servo_root, *args)

paths = {"include_manifest": wpt_path("include.ini"),
"config": wpt_path("config.ini")}
"config": wpt_path("config.ini"),
"ca-cert-path": wpt_path("web-platform-tests/tools/certs/cacert.pem"),
"host-key-path": wpt_path("web-platform-tests/tools/certs/web-platform.test.key"),
"host-cert-path": wpt_path("web-platform-tests/tools/certs/web-platform.test.pem"),
}
# Imports
sys.path.append(wpt_path("web-platform-tests", "tools"))
import localpaths # noqa: flake8
@@ -74,6 +78,18 @@ def set_defaults(kwargs):
if kwargs["processes"] is None:
kwargs["processes"] = multiprocessing.cpu_count()

if kwargs["ca_cert_path"] is None:

This comment has been minimized.

Copy link
@CYBAI

CYBAI Apr 7, 2019

Collaborator

Maybe we'll want to check "ca-cert-path" in paths like the following one 👀? (Same for other new added args)

if kwargs["include_manifest"] is None and "include_manifest" in paths:

This comment has been minimized.

Copy link
@jdm

jdm Apr 7, 2019

Member

I see that the existing code has those checks, but I don't see a good reason for them.

kwargs["ca_cert_path"] = paths["ca-cert-path"]

if kwargs["host_key_path"] is None:
kwargs["host_key_path"] = paths["host-key-path"]

if kwargs["host_cert_path"] is None:
kwargs["host_cert_path"] = paths["host-cert-path"]

if kwargs["ssl_type"] is None:
kwargs["ssl_type"] = "pregenerated"

kwargs["user_stylesheets"].append(servo_path("resources", "ahem.css"))

wptcommandline.check_args(kwargs)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.