From 3421d049aa05a3f6c8b6f1baf42c11677f67e297 Mon Sep 17 00:00:00 2001 From: Liangsheng Yin Date: Tue, 25 Nov 2025 23:05:06 +0800 Subject: [PATCH] [CI] rename: `per_commit` -> `registered` (#13928) --- .../test_function_call_parser.py | 0 .../test_json_schema_constraint.py | 0 .../function_call/test_unknown_tool_name.py | 0 .../test_srt_backend.py | 0 test/run_suite.py | 45 ++++++++++++------- 5 files changed, 28 insertions(+), 17 deletions(-) rename test/{per_commit => registered}/function_call/test_function_call_parser.py (100%) rename test/{per_commit => registered}/function_call/test_json_schema_constraint.py (100%) rename test/{per_commit => registered}/function_call/test_unknown_tool_name.py (100%) rename test/{per_commit => registered}/test_srt_backend.py (100%) diff --git a/test/per_commit/function_call/test_function_call_parser.py b/test/registered/function_call/test_function_call_parser.py similarity index 100% rename from test/per_commit/function_call/test_function_call_parser.py rename to test/registered/function_call/test_function_call_parser.py diff --git a/test/per_commit/function_call/test_json_schema_constraint.py b/test/registered/function_call/test_json_schema_constraint.py similarity index 100% rename from test/per_commit/function_call/test_json_schema_constraint.py rename to test/registered/function_call/test_json_schema_constraint.py diff --git a/test/per_commit/function_call/test_unknown_tool_name.py b/test/registered/function_call/test_unknown_tool_name.py similarity index 100% rename from test/per_commit/function_call/test_unknown_tool_name.py rename to test/registered/function_call/test_unknown_tool_name.py diff --git a/test/per_commit/test_srt_backend.py b/test/registered/test_srt_backend.py similarity index 100% rename from test/per_commit/test_srt_backend.py rename to test/registered/test_srt_backend.py diff --git a/test/run_suite.py b/test/run_suite.py index 88e6f185f..2bdacb2c5 100644 --- a/test/run_suite.py +++ b/test/run_suite.py @@ -11,28 +11,43 @@ HW_MAPPING = { "amd": HWBackend.AMD, } -LABEL_MAPPING = { +PER_COMMIT_SUITES = { HWBackend.CPU: ["default"], HWBackend.AMD: ["stage-a-test-1"], HWBackend.CUDA: ["stage-a-test-1"], } -def _filter_tests( - ci_tests: List[CIRegistry], hw: HWBackend, suite: str +def filter_tests( + ci_tests: List[CIRegistry], hw: HWBackend, suite: str, nightly: bool = False ) -> List[CIRegistry]: - ci_tests = [t for t in ci_tests if t.backend == hw] + ci_tests = [ + t + for t in ci_tests + if t.backend == hw and t.suite == suite and t.nightly == nightly + ] + ret = [] for t in ci_tests: - assert t.suite in LABEL_MAPPING[hw], f"Unknown stage {t.suite} for backend {hw}" - if t.suite == suite: + if not nightly: + assert ( + t.suite in PER_COMMIT_SUITES[hw] + ), f"Unknown stage {t.suite} for backend {hw}" + else: + raise NotImplementedError("Nightly tests are not implemented yet.") + + if t.disabled is None: ret.append(t) + print(f"Including test {t.filename}") + else: + print(f"Skipping disabled test {t.filename} due to: {t.disabled}") + return ret -def run_per_commit(hw: HWBackend, suite: str): - files = glob.glob("per_commit/**/*.py", recursive=True) - ci_tests = _filter_tests(collect_tests(files), hw, suite) +def run_a_suite(hw: HWBackend, suite: str, nightly: bool = False): + files = glob.glob("registered/**/*.py", recursive=True) + ci_tests = filter_tests(collect_tests(files), hw, suite, nightly) test_files = [TestFile(t.filename, t.est_time) for t in ci_tests] run_unittest_files( @@ -47,19 +62,15 @@ def main(): parser.add_argument( "--hw", type=str, - choices=["cpu", "cuda", "amd"], + choices=HW_MAPPING.keys(), required=True, help="Hardware backend to run tests on.", ) - parser.add_argument( - "--suite", - type=str, - required=True, - help="Test suite to run.", - ) + parser.add_argument("--suite", type=str, required=True, help="Test suite to run.") + parser.add_argument("--nightly", action="store_true") args = parser.parse_args() hw = HW_MAPPING[args.hw] - run_per_commit(hw, args.suite) + run_a_suite(hw, args.suite, args.nightly) if __name__ == "__main__":