Do not separate message/stream compression levels

2 files changed, 1 insertions, 24 deletions

diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc
index bfabd0f9c1..618839f03d 100644
--- a/test/core/end2end/tests/compressed_payload.cc
+++ b/test/core/end2end/tests/compressed_payload.cc
@@ -591,7 +591,7 @@ static void test_invoke_request_with_server_level(
   request_with_payload_template(
       config, "test_invoke_request_with_server_level", 0, GRPC_COMPRESS_NONE,
       GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE /* ignored */,
-      nullptr, true, GRPC_COMPRESS_LEVEL_MESSAGE_HIGH, false);
+      nullptr, true, GRPC_COMPRESS_LEVEL_HIGH, false);
 }
 
 static void test_invoke_request_with_compressed_payload_md_override(
diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc
index 638149a1cf..256059520d 100644
--- a/test/core/end2end/tests/stream_compression_compressed_payload.cc
+++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc
@@ -569,15 +569,6 @@ static void test_invoke_request_with_send_message_before_initial_metadata(
       GRPC_COMPRESS_LEVEL_NONE, true, false, GRPC_COMPRESS_NONE);
 }
 
-static void test_invoke_request_with_server_level(
-    grpc_end2end_test_config config) {
-  request_with_payload_template(
-      config, "test_invoke_request_with_server_level", 0, GRPC_COMPRESS_NONE,
-      GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, GRPC_COMPRESS_STREAM_GZIP,
-      /* ignored */ nullptr, true, GRPC_COMPRESS_LEVEL_STREAM_HIGH, false,
-      false, GRPC_COMPRESS_NONE);
-}
-
 static void test_invoke_request_with_compressed_payload_md_override(
     grpc_end2end_test_config config) {
   grpc_metadata gzip_compression_override;
@@ -620,25 +611,11 @@ static void test_invoke_request_with_disabled_algorithm(
       GRPC_STATUS_UNIMPLEMENTED, nullptr);
 }
 
-static void test_stream_compression_override_message_compression(
-    grpc_end2end_test_config config) {
-  grpc_compression_level level = GRPC_COMPRESS_LEVEL_STREAM_MED;
-  request_with_payload_template(
-      config, "test_stream_compression_override_message_compression", 0,
-      GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE,
-      grpc_compression_algorithm_for_level(
-          level, (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1),
-      /* ignored */ nullptr, true, level, false, true,
-      GRPC_COMPRESS_MESSAGE_GZIP);
-}
-
 void stream_compression_compressed_payload(grpc_end2end_test_config config) {
   test_invoke_request_with_compressed_payload(config);
   test_invoke_request_with_send_message_before_initial_metadata(config);
-  test_invoke_request_with_server_level(config);
   test_invoke_request_with_compressed_payload_md_override(config);
   test_invoke_request_with_disabled_algorithm(config);
-  test_stream_compression_override_message_compression(config);
 }
 
 void stream_compression_compressed_payload_pre_init(void) {}