Merge pull request #17832 from jtattermusch/fix_counterintuitive_timeouts

Fix counterintuitive test size behavior in grpc_cc_test

bazel/grpc_build_system.bzl

@@ -132,7 +132,7 @@ def grpc_proto_library(
         generate_mocks = generate_mocks,
     )
 
-def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = "moderate", tags = [], exec_compatible_with = []):
+def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = None, tags = [], exec_compatible_with = []):
     copts = []
     if language.upper() == "C":
         copts = if_not_windows(["-std=c99"])

test/cpp/end2end/BUILD

@@ -223,7 +223,6 @@ grpc_cc_test(
         ":end2end_test_lib",
     ],
     size = "large",  # with poll-cv this takes long, see #17493
-    timeout = "long",
 )
 
 grpc_cc_test(