Closed Bug 1609358 Opened 4 years ago Closed 4 years ago

[wpt-sync] Sync PR 21185 - [WPT/common/security-features] Allow `excluded_tests` based on `expectation` value

Categories

(Testing :: web-platform-tests, task, P4)

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox74 fixed)

Status:
RESOLVED FIXED
Milestone:
mozilla74
Tracking Flags:
Tracking Status
firefox74 --- fixed

People

(Reporter: mozilla.org, Unassigned)

References

(
URL
)

Details

(Whiteboard: [wptsync downstream])

Sync web-platform-tests PR 21185 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/web-platform-tests/wpt/pull/21185
Details from upstream follow.

Hiroshige Hayashizaki <hiroshige@chromium.org> wrote:

[WPT/common/security-features] Allow excluded_tests based on expectation value

Previously: excluded_tests excluded selections
that have the same values for the fields included in selection_pattern.

However, as selection_pattern doesn't contain expectation,
expectation can't be used in excluded_tests, blocking [1].

After this CL: excluded_tests excluded selections
that have the same values for all the fields (except for name).

For this purpose, this CL:

  • Sets delivery_key for excluded_selection, so that
    selections and excluded selections have the same set of fields.
  • Uses dump_test_parameters() rather than selection_pattern
    for exclusion matching (exclusion_dict).
  • Applies exclusions after all overrides are processed.
    This is a fix for cases like:
    • "default" selection A
    • "override" selection B, overriding A
    • exclusion pattern E, matching B but not A
      Previously: E excludes B but not A, so A is generated.
      After this CL: B overrides A, then E excludes B.
      As A is already overridden, no selections are generated.

This CL doesn't change generated results, because before [1]
there are no cases hitting these issues.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1991066

Bug: 906850
Change-Id: Ifa36167df710edd89d4e572346a3f1b928710119

Reviewed-on: https://chromium-review.googlesource.com/1991074
WPT-Export-Revision: 251b4c4a6ac75b2f155403835dc33d4d5bc994bc

PR 21185 applied with additional changes from upstream: d0adb1443bac2da650b04db557cf38ae6b368071
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/ebc4e12919f6
[wpt PR 21185] - [WPT/common/security-features] Allow `excluded_tests` based on `expectation` value, a=testonly
Test result changes from PR not available.

https://hg.mozilla.org/mozilla-central/rev/ebc4e12919f6

Status: NEW → RESOLVED
Closed: 4 years ago
status-firefox74: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla74
You need to log in before you can comment on or make changes to this bug.