From 7bc84a22566af77c6e73aa7123c31dc2dffe79dd Mon Sep 17 00:00:00 2001
From: Adele Zhou <adelez@google.com>
Date: Thu, 22 Mar 2018 12:00:07 -0700
Subject: Use timeout instead of size

---
 bazel/grpc_build_system.bzl     | 4 ++--
 test/core/end2end/fuzzers/BUILD | 2 +-
 test/core/util/grpc_fuzzer.bzl  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 3ec817748d..b511f12708 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -108,7 +108,7 @@ def grpc_proto_library(name, srcs = [], deps = [], well_known_protos = False,
     generate_mocks = generate_mocks,
   )
 
-def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium"):
+def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", timeout = "moderate"):
   copts = []
   if language.upper() == "C":
     copts = if_not_windows(["-std=c99"])
@@ -120,7 +120,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
     'deps': deps + _get_external_deps(external_deps),
     'copts': copts,
     'linkopts': if_not_windows(["-pthread"]),
-    'size': size,
+    'timeout': timeout,
   }
   if uses_polling:
     native.cc_test(testonly=True, tags=['manual'], **args)
diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD
index 91915b2755..7f14f82237 100644
--- a/test/core/end2end/fuzzers/BUILD
+++ b/test/core/end2end/fuzzers/BUILD
@@ -25,7 +25,7 @@ grpc_fuzzer(
     srcs = ["api_fuzzer.cc"],
     language = "C++",
     corpus = "api_fuzzer_corpus",
-    size = "enormous",
+    timeout = "eternal",
     deps = [
         "//:gpr",
         "//:grpc",
diff --git a/test/core/util/grpc_fuzzer.bzl b/test/core/util/grpc_fuzzer.bzl
index cff7dc0320..f963ad22f3 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 = [], **kwargs):
+def grpc_fuzzer(name, corpus, srcs = [], deps = [], timeout = "long", **kwargs):
   grpc_cc_test(
     name = name,
     srcs = srcs,
@@ -23,7 +23,7 @@ def grpc_fuzzer(name, corpus, srcs = [], deps = [], **kwargs):
     external_deps = [
       'gtest',
     ],
-    size = "large",
+    timeout = timeout,
     args = ["--directory=" + native.package_name() + "/" + corpus,],
     **kwargs
   )
-- 
cgit v1.2.3