From 5061c45ce71b3cab599cf7499e4fbd1499fd3b27 Mon Sep 17 00:00:00 2001
From: ctiller <10120821+ctiller@users.noreply.github.com>
Date: Wed, 31 Jul 2024 15:25:16 +0000
Subject: [PATCH] Automated change: Fix sanity tests
---
CMakeLists.txt | 45 ---------------------
Makefile | 1 -
Package.swift | 2 -
build_autogenerated.yaml | 16 --------
config.m4 | 1 -
config.w32 | 1 -
gRPC-C++.podspec | 2 -
gRPC-Core.podspec | 3 --
grpc.gemspec | 2 -
package.xml | 2 -
src/python/grpcio/grpc_core_dependencies.py | 1 -
tools/doxygen/Doxyfile.c++.internal | 2 -
tools/doxygen/Doxyfile.core.internal | 2 -
tools/run_tests/generated/tests.json | 24 -----------
14 files changed, 104 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80051054921..4cf14986c3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,7 +1255,6 @@ if(gRPC_BUILD_TESTS)
add_dependencies(buildtests_cxx map_pipe_test)
add_dependencies(buildtests_cxx match_test)
add_dependencies(buildtests_cxx matchers_test)
- add_dependencies(buildtests_cxx max_concurrent_streams_policy_test)
add_dependencies(buildtests_cxx max_concurrent_streams_test)
add_dependencies(buildtests_cxx max_connection_age_test)
add_dependencies(buildtests_cxx max_connection_idle_test)
@@ -1940,7 +1939,6 @@ add_library(grpc
src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
src/core/ext/transport/chttp2/transport/http2_settings.cc
src/core/ext/transport/chttp2/transport/huffsyms.cc
- src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
src/core/ext/transport/chttp2/transport/parsing.cc
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -3037,7 +3035,6 @@ add_library(grpc_unsecure
src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
src/core/ext/transport/chttp2/transport/http2_settings.cc
src/core/ext/transport/chttp2/transport/huffsyms.cc
- src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
src/core/ext/transport/chttp2/transport/parsing.cc
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -20284,48 +20281,6 @@ target_link_libraries(matchers_test
)
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(max_concurrent_streams_policy_test
- src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
- test/core/transport/chttp2/max_concurrent_streams_policy_test.cc
-)
-if(WIN32 AND MSVC)
- if(BUILD_SHARED_LIBS)
- target_compile_definitions(max_concurrent_streams_policy_test
- PRIVATE
- "GPR_DLL_IMPORTS"
- )
- endif()
-endif()
-target_compile_features(max_concurrent_streams_policy_test PUBLIC cxx_std_14)
-target_include_directories(max_concurrent_streams_policy_test
- PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
- ${_gRPC_RE2_INCLUDE_DIR}
- ${_gRPC_SSL_INCLUDE_DIR}
- ${_gRPC_UPB_GENERATED_DIR}
- ${_gRPC_UPB_GRPC_GENERATED_DIR}
- ${_gRPC_UPB_INCLUDE_DIR}
- ${_gRPC_XXHASH_INCLUDE_DIR}
- ${_gRPC_ZLIB_INCLUDE_DIR}
- third_party/googletest/googletest/include
- third_party/googletest/googletest
- third_party/googletest/googlemock/include
- third_party/googletest/googlemock
- ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(max_concurrent_streams_policy_test
- ${_gRPC_ALLTARGETS_LIBRARIES}
- gtest
- gpr
-)
-
-
endif()
if(gRPC_BUILD_TESTS)
diff --git a/Makefile b/Makefile
index 68bb2cdbfaf..5d194c1d104 100644
--- a/Makefile
+++ b/Makefile
@@ -726,7 +726,6 @@ LIBGRPC_SRC = \
src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \
src/core/ext/transport/chttp2/transport/http2_settings.cc \
src/core/ext/transport/chttp2/transport/huffsyms.cc \
- src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \
src/core/ext/transport/chttp2/transport/parsing.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc \
src/core/ext/transport/chttp2/transport/ping_callbacks.cc \
diff --git a/Package.swift b/Package.swift
index bba949769a6..77eaaa3be2e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -244,8 +244,6 @@ let package = Package(
"src/core/ext/transport/chttp2/transport/huffsyms.h",
"src/core/ext/transport/chttp2/transport/internal.h",
"src/core/ext/transport/chttp2/transport/legacy_frame.h",
- "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc",
- "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h",
"src/core/ext/transport/chttp2/transport/parsing.cc",
"src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc",
"src/core/ext/transport/chttp2/transport/ping_abuse_policy.h",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index f835595b41b..f80ef09daff 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -290,7 +290,6 @@ libs:
- src/core/ext/transport/chttp2/transport/huffsyms.h
- src/core/ext/transport/chttp2/transport/internal.h
- src/core/ext/transport/chttp2/transport/legacy_frame.h
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h
- src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
- src/core/ext/transport/chttp2/transport/ping_callbacks.h
- src/core/ext/transport/chttp2/transport/ping_rate_policy.h
@@ -1319,7 +1318,6 @@ libs:
- src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
- src/core/ext/transport/chttp2/transport/http2_settings.cc
- src/core/ext/transport/chttp2/transport/huffsyms.cc
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
- src/core/ext/transport/chttp2/transport/parsing.cc
- src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
- src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -2289,7 +2287,6 @@ libs:
- src/core/ext/transport/chttp2/transport/huffsyms.h
- src/core/ext/transport/chttp2/transport/internal.h
- src/core/ext/transport/chttp2/transport/legacy_frame.h
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h
- src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
- src/core/ext/transport/chttp2/transport/ping_callbacks.h
- src/core/ext/transport/chttp2/transport/ping_rate_policy.h
@@ -2764,7 +2761,6 @@ libs:
- src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
- src/core/ext/transport/chttp2/transport/http2_settings.cc
- src/core/ext/transport/chttp2/transport/huffsyms.cc
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
- src/core/ext/transport/chttp2/transport/parsing.cc
- src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
- src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -13335,18 +13331,6 @@ targets:
deps:
- gtest
- grpc_test_util
-- name: max_concurrent_streams_policy_test
- gtest: true
- build: test
- language: c++
- headers:
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h
- src:
- - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc
- - test/core/transport/chttp2/max_concurrent_streams_policy_test.cc
- deps:
- - gtest
- - gpr
- name: max_concurrent_streams_test
gtest: true
build: test
diff --git a/config.m4 b/config.m4
index f80bc3a2159..00594e8878f 100644
--- a/config.m4
+++ b/config.m4
@@ -101,7 +101,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \
src/core/ext/transport/chttp2/transport/http2_settings.cc \
src/core/ext/transport/chttp2/transport/huffsyms.cc \
- src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \
src/core/ext/transport/chttp2/transport/parsing.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc \
src/core/ext/transport/chttp2/transport/ping_callbacks.cc \
diff --git a/config.w32 b/config.w32
index 0384064082d..d443a78a90e 100644
--- a/config.w32
+++ b/config.w32
@@ -66,7 +66,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\transport\\chttp2\\transport\\hpack_parser_table.cc " +
"src\\core\\ext\\transport\\chttp2\\transport\\http2_settings.cc " +
"src\\core\\ext\\transport\\chttp2\\transport\\huffsyms.cc " +
- "src\\core\\ext\\transport\\chttp2\\transport\\max_concurrent_streams_policy.cc " +
"src\\core\\ext\\transport\\chttp2\\transport\\parsing.cc " +
"src\\core\\ext\\transport\\chttp2\\transport\\ping_abuse_policy.cc " +
"src\\core\\ext\\transport\\chttp2\\transport\\ping_callbacks.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index f9092fb9bc7..d11375352e7 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -374,7 +374,6 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/huffsyms.h',
'src/core/ext/transport/chttp2/transport/internal.h',
'src/core/ext/transport/chttp2/transport/legacy_frame.h',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
@@ -1657,7 +1656,6 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/huffsyms.h',
'src/core/ext/transport/chttp2/transport/internal.h',
'src/core/ext/transport/chttp2/transport/legacy_frame.h',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 1507f2037c5..be9a936567d 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -364,8 +364,6 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/huffsyms.h',
'src/core/ext/transport/chttp2/transport/internal.h',
'src/core/ext/transport/chttp2/transport/legacy_frame.h',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h',
'src/core/ext/transport/chttp2/transport/parsing.cc',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
@@ -2438,7 +2436,6 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/huffsyms.h',
'src/core/ext/transport/chttp2/transport/internal.h',
'src/core/ext/transport/chttp2/transport/legacy_frame.h',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 56e70feda77..1b756c6a5cd 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -250,8 +250,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/transport/chttp2/transport/huffsyms.h )
s.files += %w( src/core/ext/transport/chttp2/transport/internal.h )
s.files += %w( src/core/ext/transport/chttp2/transport/legacy_frame.h )
- s.files += %w( src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc )
- s.files += %w( src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h )
s.files += %w( src/core/ext/transport/chttp2/transport/parsing.cc )
s.files += %w( src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc )
s.files += %w( src/core/ext/transport/chttp2/transport/ping_abuse_policy.h )
diff --git a/package.xml b/package.xml
index 74e93567698..5d6e0d70d0f 100644
--- a/package.xml
+++ b/package.xml
@@ -232,8 +232,6 @@
-
-
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 75a21995f6f..53b0c28a869 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -75,7 +75,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/transport/chttp2/transport/hpack_parser_table.cc',
'src/core/ext/transport/chttp2/transport/http2_settings.cc',
'src/core/ext/transport/chttp2/transport/huffsyms.cc',
- 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc',
'src/core/ext/transport/chttp2/transport/parsing.cc',
'src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc',
'src/core/ext/transport/chttp2/transport/ping_callbacks.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index ca9f1d59939..ef487dae409 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1254,8 +1254,6 @@ src/core/ext/transport/chttp2/transport/huffsyms.cc \
src/core/ext/transport/chttp2/transport/huffsyms.h \
src/core/ext/transport/chttp2/transport/internal.h \
src/core/ext/transport/chttp2/transport/legacy_frame.h \
-src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \
-src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h \
src/core/ext/transport/chttp2/transport/parsing.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index f2df91ec3c9..1d0b40f7a5b 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1022,8 +1022,6 @@ src/core/ext/transport/chttp2/transport/huffsyms.cc \
src/core/ext/transport/chttp2/transport/huffsyms.h \
src/core/ext/transport/chttp2/transport/internal.h \
src/core/ext/transport/chttp2/transport/legacy_frame.h \
-src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \
-src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h \
src/core/ext/transport/chttp2/transport/parsing.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc \
src/core/ext/transport/chttp2/transport/ping_abuse_policy.h \
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 0454b996991..974b044f454 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -6091,30 +6091,6 @@
],
"uses_polling": true
},
- {
- "args": [],
- "benchmark": false,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "exclude_configs": [],
- "exclude_iomgrs": [],
- "flaky": false,
- "gtest": true,
- "language": "c++",
- "name": "max_concurrent_streams_policy_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "uses_polling": true
- },
{
"args": [],
"benchmark": false,