Consolidate similar tests to reduce duplication (#12871)

test/srt/run_suite.py

@@ -17,10 +17,8 @@ suites = {
     "per-commit-1-gpu": [
         TestFile("debug_utils/test_tensor_dump_forward_hook.py", 15),
         TestFile("function_call/test_json_schema_constraint.py", 1),
-        TestFile("hicache/test_hicache.py", 116),
-        TestFile("hicache/test_hicache_eagle.py", 150),
-        TestFile("hicache/test_hicache_mla.py", 127),
         TestFile("hicache/test_hicache_storage.py", 127),
+        TestFile("hicache/test_hicache_variants.py", 393),
         TestFile("layers/attention/mamba/test_causal_conv1d.py", 25),
         TestFile("layers/attention/mamba/test_mamba_ssm.py", 50),
         TestFile("layers/attention/mamba/test_mamba_ssm_ssd.py", 20),
@@ -246,7 +244,6 @@ suites = {
         TestFile("ep/test_moe_deepep_eval_accuracy_large.py"),
         TestFile("function_call/test_unknown_tool_name.py"),
         TestFile("hicache/test_disaggregation_hicache.py"),
-        TestFile("hicache/test_hicache_page.py"),
         TestFile("hicache/test_hicache_storage_benchmark.py"),
         TestFile("hicache/test_hicache_storage_e2e.py"),
         TestFile("layers/attention/nsa/test_act_quant_triton.py"),
@@ -313,10 +310,8 @@ suites = {
         TestFile("test_get_weights_by_name.py"),
         TestFile("test_gpt_oss_common.py"),
         TestFile("test_health_check.py"),
-        TestFile("test_hicache.py"),
-        TestFile("test_hicache_mla.py"),
-        TestFile("test_hicache_page.py"),
         TestFile("test_hicache_storage.py"),
+        TestFile("test_hicache_variants.py"),
         TestFile("test_hybrid_dp_ep_tp_mtp.py"),
         TestFile("test_int4_kernel.py"),
         TestFile("test_int8_kernel.py"),