diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-18 12:44:57 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-18 12:44:57 -0700 |
| commit | e50e5cbde2f77166b9f557938252de6792557f84 (patch) | |
| tree | 9f98d7eeb39f1804eda3cbe996e0813f72a5c9f8 /tools | |
| parent | bb1c795f998f052f854a6e1aeebff44e293a29f4 (diff) | |
Add a timeout to shutdown to forcefully end calls
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 17 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 72e6c41508..50f078586d 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1626,6 +1626,23 @@ "gpr_test_util", "grpc", "grpc++", + "grpc++_test_util", + "grpc_test_util", + "grpc_zookeeper" + ], + "headers": [], + "language": "c++", + "name": "shutdown_test", + "src": [ + "test/cpp/end2end/shutdown_test.cc" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc++", "grpc_test_util" ], "headers": [], diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index c25c0f3d7d..5f0452d76a 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1434,6 +1434,23 @@ ], "flaky": false, "language": "c++", + "name": "shutdown_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "flaky": false, + "language": "c++", "name": "status_test", "platforms": [ "linux", |