Bug 1568733 [wpt PR 18068] - [WPT/common/security-features] Add delivery_key, a=testonly

Automatic update from web-platform-tests
[WPT/common/security-features] Add delivery_key

This CL adds `delivery_key` to spec.src.json down to
the JSON objects supplied to JavaScript test runners,
to distinguish referrer-policy and mixed-content tests
explicitly by data fields.

Generated files will be updated after some more changes, not now.

Bug: 906850
Change-Id: Iedae7830cbc41eb87ab884a88aa9e667cc54f6e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717109
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681032}

--

wpt-commits: 2c422b2075e70226d9f531d684915798a33e8259
wpt-pr: 18068
This commit is contained in:
Hiroshige Hayashizaki 2019-08-01 14:29:55 +00:00 committed by moz-wptsync-bot
parent 534ebce902
commit 2084e98a19
5 changed files with 11 additions and 5 deletions

View File

@ -168,6 +168,7 @@ def generate_test_source_files(config, spec_json, target):
expansion = expand_pattern(expansion_pattern,
test_expansion_schema)
for selection in permute_expansion(expansion, artifact_order):
selection['delivery_key'] = spec_json['delivery_key']
selection_path = config.selection_pattern % selection
if not selection_path in exclusion_dict:
if selection_path in output_dict:

View File

@ -76,9 +76,10 @@ def validate(spec_json, details):
""" Validates the json specification for generating tests. """
details['object'] = spec_json
assert_contains_only_fields(
spec_json,
["specification", "test_expansion_schema", "excluded_tests"])
assert_contains_only_fields(spec_json, [
"specification", "delivery_key", "test_expansion_schema",
"excluded_tests"
])
assert_non_empty_list(spec_json, "specification")
assert_non_empty_dict(spec_json, "test_expansion_schema")
assert_non_empty_list(spec_json, "excluded_tests")

View File

@ -124,6 +124,8 @@
}
],
"delivery_key": "mixedContent",
"excluded_tests": [
{
"name": "Redundant-subresources",

View File

@ -77,8 +77,8 @@ def validate(spec_json, details):
details['object'] = spec_json
assert_contains_only_fields(spec_json, [
"specification", "referrer_policy_schema", "test_expansion_schema",
"excluded_tests"
"specification", "referrer_policy_schema", "delivery_key",
"test_expansion_schema", "excluded_tests"
])
assert_non_empty_list(spec_json, "specification")
assert_non_empty_list(spec_json, "referrer_policy_schema")

View File

@ -446,6 +446,8 @@
}
],
"delivery_key": "referrerPolicy",
"excluded_tests":[
{
"name": "cross-origin-workers",