aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-11 09:49:23 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-11 09:49:23 -0700
commiteab5bcb96facbdf092b7061a03d2d4d7dd6d4863 (patch)
tree58af67b3338c221c03efcbb769062b1a1cb2ddfb /templates
parent4048569477b71aab51821beea4ef2e4698779b93 (diff)
parent58e5d90e20e6b5f93748f3b5a32c64e86f00e0c6 (diff)
Merge github.com:grpc/grpc into chttp2_timer
Diffstat (limited to 'templates')
-rw-r--r--templates/tools/run_tests/generated/tests.json.template3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/tools/run_tests/generated/tests.json.template b/templates/tools/run_tests/generated/tests.json.template
index 10ab2e445a..0c9f0a14c4 100644
--- a/templates/tools/run_tests/generated/tests.json.template
+++ b/templates/tools/run_tests/generated/tests.json.template
@@ -13,7 +13,8 @@
"exclude_iomgrs": tgt.get("exclude_iomgrs", []),
"args": tgt.get("args", []),
"flaky": tgt.flaky,
- "cpu_cost": tgt.get("cpu_cost", 1.0)}
+ "cpu_cost": tgt.get("cpu_cost", 1.0),
+ "uses_polling": tgt.get("uses_polling", True)}
timeout_seconds = tgt.get("timeout_seconds", None)
if timeout_seconds:
out['timeout_seconds'] = timeout_seconds