From 986070d280b179520e17c95a6e8ba70c8fe1a480 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 14 Nov 2019 11:17:31 -0500
Subject: [PATCH] use test size instead of timeout

---
 src/python/grpcio_tests/tests/reflection/BUILD.bazel | 3 +--
 test/core/end2end/fuzzers/BUILD                      | 1 -
 test/core/util/grpc_fuzzer.bzl                       | 3 +--
 test/cpp/end2end/BUILD                               | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/python/grpcio_tests/tests/reflection/BUILD.bazel b/src/python/grpcio_tests/tests/reflection/BUILD.bazel
index c2e9443384b..6d37618365f 100644
--- a/src/python/grpcio_tests/tests/reflection/BUILD.bazel
+++ b/src/python/grpcio_tests/tests/reflection/BUILD.bazel
@@ -5,8 +5,7 @@ package(default_visibility = ["//visibility:public"])
 
 py2and3_test(
     name = "_reflection_servicer_test",
-    size = "small",
-    timeout = "moderate",
+    size = "medium",
     srcs = ["_reflection_servicer_test.py"],
     imports = ["../../"],
     main = "_reflection_servicer_test.py",
diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD
index d031452a57e..4b450dce47b 100644
--- a/test/core/end2end/fuzzers/BUILD
+++ b/test/core/end2end/fuzzers/BUILD
@@ -23,7 +23,6 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 grpc_fuzzer(
     name = "api_fuzzer",
     size = "enormous",
-    timeout = "eternal",
     srcs = ["api_fuzzer.cc"],
     corpus = "api_fuzzer_corpus",
     language = "C++",
diff --git a/test/core/util/grpc_fuzzer.bzl b/test/core/util/grpc_fuzzer.bzl
index 7f4737a218b..e0a9b78df2f 100644
--- a/test/core/util/grpc_fuzzer.bzl
+++ b/test/core/util/grpc_fuzzer.bzl
@@ -14,7 +14,7 @@
 
 load("//bazel:grpc_build_system.bzl", "grpc_cc_test")
 
-def grpc_fuzzer(name, corpus, srcs = [], deps = [], size = "large", timeout = "long", **kwargs):
+def grpc_fuzzer(name, corpus, srcs = [], deps = [], size = "large", **kwargs):
     grpc_cc_test(
         name = name,
         srcs = srcs,
@@ -24,7 +24,6 @@ def grpc_fuzzer(name, corpus, srcs = [], deps = [], size = "large", timeout = "l
             "gtest",
         ],
         size = size,
-        timeout = timeout,
         args = ["--directory=" + native.package_name() + "/" + corpus],
         **kwargs
     )
diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD
index 962f91b8119..3744f13b4b8 100644
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@@ -494,7 +494,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "xds_end2end_test",
-    timeout = "long",
+    size = "large",
     srcs = ["xds_end2end_test.cc"],
     external_deps = [
         "gtest",
@@ -704,7 +704,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "thread_stress_test",
-    timeout = "long",
+    size = "large",
     srcs = ["thread_stress_test.cc"],
     external_deps = [
         "gtest",