Remove packet coalescing testing on chttp2

12 files changed, 8 insertions, 756 deletions

diff --git a/Makefile b/Makefile
index 66e992ef09..8f7328ae28 100644
--- a/Makefile
+++ b/Makefile
@@ -7199,7 +7199,6 @@ LIBEND2END_TESTS_SRC = \
     test/core/end2end/tests/network_status_change.c \
     test/core/end2end/tests/no_logging.c \
     test/core/end2end/tests/no_op.c \
-    test/core/end2end/tests/packet_coalescing.c \
     test/core/end2end/tests/payload.c \
     test/core/end2end/tests/ping.c \
     test/core/end2end/tests/ping_pong_streaming.c \
@@ -7286,7 +7285,6 @@ LIBEND2END_NOSEC_TESTS_SRC = \
     test/core/end2end/tests/network_status_change.c \
     test/core/end2end/tests/no_logging.c \
     test/core/end2end/tests/no_op.c \
-    test/core/end2end/tests/packet_coalescing.c \
     test/core/end2end/tests/payload.c \
     test/core/end2end/tests/ping.c \
     test/core/end2end/tests/ping_pong_streaming.c \
diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
index fe9a7c2247..315d942484 100644
--- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
+++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
@@ -168,6 +168,9 @@ static grpc_end2end_test_config configs[] = {
      chttp2_tear_down_secure_fullstack},
 };
 
+extern void packet_coalescing(grpc_end2end_test_config config);
+extern void packet_coalescing_pre_init(void);
+
 static char *roots_filename;
 
 @interface CoreCronetEnd2EndTests : XCTestCase
@@ -347,7 +350,11 @@ static char *roots_filename;
 }
 
 - (void)testPacketCoalescing {
-  [self testIndividualCase:"packet_coalescing"];
+  // Directly invoke the test function since the test is for Cronet only and thus not included in
+  // end2end_tests.c
+  // TODO (mxyan): Do the same to all test cases so that this file will no longer depend on
+  // end2end_tests.c
+  packet_coalescing(configs[0]);
 }
 
 - (void)testPayload {
diff --git a/test/core/end2end/end2end_nosec_tests.c b/test/core/end2end/end2end_nosec_tests.c
index 0581607e80..663489082f 100644
--- a/test/core/end2end/end2end_nosec_tests.c
+++ b/test/core/end2end/end2end_nosec_tests.c
@@ -103,8 +103,6 @@ extern void no_logging(grpc_end2end_test_config config);
 extern void no_logging_pre_init(void);
 extern void no_op(grpc_end2end_test_config config);
 extern void no_op_pre_init(void);
-extern void packet_coalescing(grpc_end2end_test_config config);
-extern void packet_coalescing_pre_init(void);
 extern void payload(grpc_end2end_test_config config);
 extern void payload_pre_init(void);
 extern void ping(grpc_end2end_test_config config);
@@ -171,7 +169,6 @@ void grpc_end2end_tests_pre_init(void) {
   network_status_change_pre_init();
   no_logging_pre_init();
   no_op_pre_init();
-  packet_coalescing_pre_init();
   payload_pre_init();
   ping_pre_init();
   ping_pong_streaming_pre_init();
@@ -227,7 +224,6 @@ void grpc_end2end_tests(int argc, char **argv,
     network_status_change(config);
     no_logging(config);
     no_op(config);
-    packet_coalescing(config);
     payload(config);
     ping(config);
     ping_pong_streaming(config);
@@ -368,10 +364,6 @@ void grpc_end2end_tests(int argc, char **argv,
       no_op(config);
       continue;
     }
-    if (0 == strcmp("packet_coalescing", argv[i])) {
-      packet_coalescing(config);
-      continue;
-    }
     if (0 == strcmp("payload", argv[i])) {
       payload(config);
       continue;
diff --git a/test/core/end2end/end2end_tests.c b/test/core/end2end/end2end_tests.c
index 66908bab60..25c7c62fde 100644
--- a/test/core/end2end/end2end_tests.c
+++ b/test/core/end2end/end2end_tests.c
@@ -105,8 +105,6 @@ extern void no_logging(grpc_end2end_test_config config);
 extern void no_logging_pre_init(void);
 extern void no_op(grpc_end2end_test_config config);
 extern void no_op_pre_init(void);
-extern void packet_coalescing(grpc_end2end_test_config config);
-extern void packet_coalescing_pre_init(void);
 extern void payload(grpc_end2end_test_config config);
 extern void payload_pre_init(void);
 extern void ping(grpc_end2end_test_config config);
@@ -174,7 +172,6 @@ void grpc_end2end_tests_pre_init(void) {
   network_status_change_pre_init();
   no_logging_pre_init();
   no_op_pre_init();
-  packet_coalescing_pre_init();
   payload_pre_init();
   ping_pre_init();
   ping_pong_streaming_pre_init();
@@ -231,7 +228,6 @@ void grpc_end2end_tests(int argc, char **argv,
     network_status_change(config);
     no_logging(config);
     no_op(config);
-    packet_coalescing(config);
     payload(config);
     ping(config);
     ping_pong_streaming(config);
@@ -376,10 +372,6 @@ void grpc_end2end_tests(int argc, char **argv,
       no_op(config);
       continue;
     }
-    if (0 == strcmp("packet_coalescing", argv[i])) {
-      packet_coalescing(config);
-      continue;
-    }
     if (0 == strcmp("payload", argv[i])) {
       payload(config);
       continue;
diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py
index 3ae2b2cb9c..78779908a9 100755
--- a/test/core/end2end/gen_build_yaml.py
+++ b/test/core/end2end/gen_build_yaml.py
@@ -126,7 +126,6 @@ END2END_TESTS = {
     'network_status_change': default_test_options,
     'no_logging': default_test_options._replace(traceable=False),
     'no_op': default_test_options,
-    'packet_coalescing': default_test_options,
     'payload': default_test_options,
     'load_reporting_hook': default_test_options,
     'ping_pong_streaming': default_test_options,
diff --git a/test/core/end2end/tests/packet_coalescing.c b/test/core/end2end/tests/packet_coalescing.c
index d560c57da8..336f765a13 100644
--- a/test/core/end2end/tests/packet_coalescing.c
+++ b/test/core/end2end/tests/packet_coalescing.c
@@ -273,10 +273,6 @@ static void test_request_response_with_metadata_and_payload(
 }
 
 void packet_coalescing(grpc_end2end_test_config config) {
-  /* The test case does not support the fixture socketpair_one_byte_at_a_time */
-  if (0 == strcmp(config.name, "chttp2/socketpair_one_byte_at_a_time")) {
-    return;
-  }
   gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
   grpc_tracer_set_enabled("all", 1);
   gpr_set_log_function(log_processor);
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index a96856c1ab..6ae269cc20 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -6347,7 +6347,6 @@
       "test/core/end2end/tests/network_status_change.c", 
       "test/core/end2end/tests/no_logging.c", 
       "test/core/end2end/tests/no_op.c", 
-      "test/core/end2end/tests/packet_coalescing.c", 
       "test/core/end2end/tests/payload.c", 
       "test/core/end2end/tests/ping.c", 
       "test/core/end2end/tests/ping_pong_streaming.c", 
@@ -6417,7 +6416,6 @@
       "test/core/end2end/tests/network_status_change.c", 
       "test/core/end2end/tests/no_logging.c", 
       "test/core/end2end/tests/no_op.c", 
-      "test/core/end2end/tests/packet_coalescing.c", 
       "test/core/end2end/tests/payload.c", 
       "test/core/end2end/tests/ping.c", 
       "test/core/end2end/tests/ping_pong_streaming.c", 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 0ba2f2a6f4..b76263b8b9 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -5714,29 +5714,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_census_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -6820,29 +6797,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_compress_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -7895,28 +7849,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_fakesec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -8913,29 +8845,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_fd_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -9973,29 +9882,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -10953,25 +10839,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full+pipe_test", 
-    "platforms": [
-      "linux"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -11945,29 +11812,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full+trace_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -13080,30 +12924,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_http_proxy_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -14203,29 +14023,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_load_reporting_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -15338,30 +15135,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_oauth2_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -16394,30 +16167,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_proxy_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -17402,30 +17151,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -18386,30 +18111,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair+trace_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -19450,32 +19151,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [
-      "msan"
-    ], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -20529,29 +20204,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_ssl_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -21635,29 +21287,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_ssl_cert_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -22674,30 +22303,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_ssl_proxy_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -23700,29 +23305,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uds_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -24783,29 +24365,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_census_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -25866,29 +25425,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_compress_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -26878,29 +26414,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_fd_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -27915,29 +27428,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -28876,25 +28366,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full+pipe_nosec_test", 
-    "platforms": [
-      "linux"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -29845,29 +29316,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_full+trace_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -30956,30 +30404,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_http_proxy_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -32056,29 +31480,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_load_reporting_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -33071,30 +32472,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_proxy_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -34055,30 +33432,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -35015,30 +34368,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair+trace_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -36053,32 +35382,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "windows", 
-      "linux", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [
-      "msan"
-    ], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_nosec_test", 
-    "platforms": [
-      "windows", 
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
@@ -37084,29 +36387,6 @@
   }, 
   {
     "args": [
-      "packet_coalescing"
-    ], 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [
-      "uv"
-    ], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uds_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "args": [
       "payload"
     ], 
     "ci_platforms": [
diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj
index 196d924287..4fb8f8f4a1 100644
--- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj
+++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj
@@ -215,8 +215,6 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters
index 73801e3635..ff82a4dd43 100644
--- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters
+++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters
@@ -97,9 +97,6 @@
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
       <Filter>test\core\end2end\tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
-      <Filter>test\core\end2end\tests</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
       <Filter>test\core\end2end\tests</Filter>
     </ClCompile>
diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj
index 7b1701005d..0b7d7c2e75 100644
--- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj
+++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj
@@ -217,8 +217,6 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters
index 2b70765176..e641930e64 100644
--- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters
+++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters
@@ -100,9 +100,6 @@
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
       <Filter>test\core\end2end\tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
-      <Filter>test\core\end2end\tests</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
       <Filter>test\core\end2end\tests</Filter>
     </ClCompile>