Skip to content

Commit f40d9da

Browse files
committed
Bug 1878955 [wpt PR 44424] - [wptrunner] Plumb expectations wpttest.{Test -> (Subtest)Result}, a=testonly
Automatic update from web-platform-tests [wptrunner] Plumb expectations `wpttest.{Test -> (Subtest)Result}` (#44424) This allows vendors to override expectations at runtime via browser-specific result converters. Instead of constructing `(Subtest)Result`s directly, executors should use the newly introduced `Test.make_{subtest_,}result()`, which have the same signatures but default to passing through the testloader-read expectations. This is a pure refactor; no functional changes intended. Successor to: web-platform-tests/wpt#44134 (comment) -- wpt-commits: a68f313a50899795e1e6660b7398544d340f1652 wpt-pr: 44424 UltraBlame original commit: b53534ad1edfde1911bd2d17ce4526db588f2942
1 parent b621ca2 commit f40d9da

11 files changed

+509
-538
lines changed

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
=
701701
test
702702
.
703-
result_cls
703+
make_result
704704
(
705705
self
706706
.
@@ -724,7 +724,7 @@
724724
[
725725
test
726726
.
727-
subtest_result_cls
727+
make_subtest_result
728728
(
729729
st_name
730730
self
@@ -1164,7 +1164,7 @@
11641164
(
11651165
test
11661166
.
1167-
result_cls
1167+
make_result
11681168
(
11691169

11701170
result
@@ -1228,7 +1228,7 @@
12281228
=
12291229
test
12301230
.
1231-
result_cls
1231+
make_result
12321232
(
12331233
*
12341234
harness_data
@@ -1239,7 +1239,7 @@
12391239
[
12401240
test
12411241
.
1242-
subtest_result_cls
1242+
make_subtest_result
12431243
(
12441244
*
12451245
item
@@ -1267,7 +1267,7 @@
12671267
return
12681268
test
12691269
.
1270-
result_cls
1270+
make_result
12711271
(
12721272
*
12731273
*
@@ -2659,7 +2659,7 @@
26592659
return
26602660
test
26612661
.
2662-
result_cls
2662+
make_result
26632663
(
26642664
status
26652665
message
@@ -4896,7 +4896,7 @@
48964896
(
48974897
test
48984898
.
4899-
result_cls
4899+
make_result
49004900
(
49014901
*
49024902
data

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorchrome.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
=
254254
test
255255
.
256-
result_cls
256+
make_result
257257
(
258258
status
259259
result

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,7 @@
15701570
(
15711571
test
15721572
.
1573-
result_cls
1573+
make_result
15741574
(
15751575
"
15761576
EXTERNAL
@@ -1595,7 +1595,7 @@
15951595
(
15961596
test
15971597
.
1598-
result_cls
1598+
make_result
15991599
(
16001600
"
16011601
CRASH
@@ -1666,7 +1666,7 @@
16661666
(
16671667
test
16681668
.
1669-
result_cls
1669+
make_result
16701670
(
16711671
"
16721672
INTERNAL
@@ -2450,7 +2450,7 @@
24502450
(
24512451
test
24522452
.
2453-
result_cls
2453+
make_result
24542454
(
24552455
"
24562456
ERROR

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6982,7 +6982,7 @@
69826982
(
69836983
test
69846984
.
6985-
result_cls
6985+
make_result
69866986
(
69876987
extra
69886988
=
@@ -9311,7 +9311,7 @@
93119311
(
93129312
test
93139313
.
9314-
result_cls
9314+
make_result
93159315
(
93169316
extra
93179317
=

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorselenium.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,7 @@
24182418
(
24192419
test
24202420
.
2421-
result_cls
2421+
make_result
24222422
(
24232423
*
24242424
data

0 commit comments

Comments
 (0)