From dd9da6592d49278c28f3b7c6bcdd7fcd6cbef94d Mon Sep 17 00:00:00 2001
From: Ming-Ying Chung <mych@chromium.org>
Date: Tue, 11 Mar 2025 19:28:25 -0700
Subject: [PATCH] [translatekit] Switch to `chrome_wpt_tests`
Per [docs][1] and [offline discussion][2], to cover the desired WPTs
under `external/wpt/ai/translator/`, the builder has to run
`chrome_wpt_tests` instead of `blink_wpt_tests`, as the latter
[filters][3] them out.
[1]: https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/run_web_platform_tests.md#running-tests-in-cq_ci
[2]: http://screen/B38zZjxUZkbuCUm
[3]: https://crsrc.org/c/third_party/blink/web_tests/TestLists/content_shell.filter;bpv=0
Bug: 394439535
Change-Id: I5f64d75bb55e98502aee2e99d174c96c128d4b05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6345091
Auto-Submit: Ming-Ying Chung <mych@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Ming-Ying Chung <mych@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431295}
---
.../config/generated/testing/test_suites.pyl | 5 +--
infra/config/targets/basic_suites.star | 2 +-
testing/buildbot/internal.translatekit.json | 45 +++++++++----------
3 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index cafc8cb35f3b5..be953ca060ecc 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -2051,14 +2051,13 @@
},
'translatekit_script_tests': {
- 'blink_wpt_tests': {
+ 'chrome_wpt_tests': {
'test_common': {
'mixins': [
'has_native_resultdb_integration',
- 'blink_tests_write_run_histories',
],
'args': [
- '--num-retries=3',
+ '--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter',
],
'merge': {
'script': '//third_party/blink/tools/merge_web_test_results.py',
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index c36dab68d2ebe..ac7bac8103a93 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -1371,7 +1371,7 @@ targets.legacy_basic_suite(
targets.legacy_basic_suite(
name = "translatekit_script_tests",
tests = {
- "blink_wpt_tests": targets.legacy_test_config(
+ "chrome_wpt_tests": targets.legacy_test_config(
args = [
"-t",
"Release",
diff --git a/testing/buildbot/internal.translatekit.json b/testing/buildbot/internal.translatekit.json
index 287e858f904de..403580df5d1c1 100644
--- a/testing/buildbot/internal.translatekit.json
+++ b/testing/buildbot/internal.translatekit.json
@@ -5,8 +5,7 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
+ "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
"-t",
"Release",
"external/wpt/ai/translator"
@@ -17,7 +16,7 @@
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
- "name": "blink_wpt_tests",
+ "name": "chrome_wpt_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -31,8 +30,8 @@
},
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "blink_wpt_tests",
- "test_id_prefix": "ninja://:blink_wpt_tests/"
+ "test": "chrome_wpt_tests",
+ "test_id_prefix": "ninja://:chrome_wpt_tests/"
}
]
},
@@ -40,8 +39,7 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
+ "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
"-t",
"Release",
"external/wpt/ai/translator"
@@ -52,7 +50,7 @@
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
- "name": "blink_wpt_tests",
+ "name": "chrome_wpt_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -66,8 +64,8 @@
},
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "blink_wpt_tests",
- "test_id_prefix": "ninja://:blink_wpt_tests/"
+ "test": "chrome_wpt_tests",
+ "test_id_prefix": "ninja://:chrome_wpt_tests/"
}
]
},
@@ -75,8 +73,7 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
+ "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
"-t",
"Release",
"external/wpt/ai/translator"
@@ -87,7 +84,7 @@
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
- "name": "blink_wpt_tests",
+ "name": "chrome_wpt_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -101,8 +98,8 @@
},
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "blink_wpt_tests",
- "test_id_prefix": "ninja://:blink_wpt_tests/"
+ "test": "chrome_wpt_tests",
+ "test_id_prefix": "ninja://:chrome_wpt_tests/"
}
]
},
@@ -110,8 +107,7 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
+ "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
"-t",
"Release",
"external/wpt/ai/translator"
@@ -122,7 +118,7 @@
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
- "name": "blink_wpt_tests",
+ "name": "chrome_wpt_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -135,8 +131,8 @@
},
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "blink_wpt_tests",
- "test_id_prefix": "ninja://:blink_wpt_tests/"
+ "test": "chrome_wpt_tests",
+ "test_id_prefix": "ninja://:chrome_wpt_tests/"
}
]
},
@@ -144,8 +140,7 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
+ "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
"-t",
"Release",
"external/wpt/ai/translator"
@@ -156,7 +151,7 @@
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
- "name": "blink_wpt_tests",
+ "name": "chrome_wpt_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -169,8 +164,8 @@
},
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "blink_wpt_tests",
- "test_id_prefix": "ninja://:blink_wpt_tests/"
+ "test": "chrome_wpt_tests",
+ "test_id_prefix": "ninja://:chrome_wpt_tests/"
}
]
}