diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-13 10:08:44 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-13 10:08:44 -0700 |
| commit | 0a949988260e39222e243f9e8c348cbb7cb1a06a (patch) | |
| tree | a4156f789ec40aaf2706b12d00781a9f704b4d3b /test/core/end2end | |
| parent | f7262057e6fff03544311cd95ea584218062e2ab (diff) | |
| parent | fba547644c7e55ae222cb130cb289e19db43b449 (diff) | |
Merge github.com:grpc/grpc into windows-fixes
Conflicts:
BUILD
src/core/iomgr/tcp_server.h
src/core/iomgr/tcp_server_posix.c
src/core/iomgr/tcp_server_windows.c
src/core/security/server_secure_chttp2.c
src/core/surface/completion_queue.c
src/core/surface/completion_queue.h
src/core/surface/server.c
test/core/end2end/tests/cancel_after_invoke.c
test/core/end2end/tests/cancel_test_helpers.h
tools/run_tests/tests.json
vsprojects/vs2013/Grpc.mak
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/tests/cancel_after_invoke.c | 3 | ||||
| -rw-r--r-- | test/core/end2end/tests/cancel_test_helpers.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 326321f4e2..592dfd415f 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -110,7 +110,8 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, grpc_op ops[6]; grpc_op *op; grpc_call *c; - grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, mode, NULL, NULL); + grpc_end2end_test_fixture f = + begin_test(config, __FUNCTION__, mode, NULL, NULL); gpr_timespec deadline = five_seconds_time(); cq_verifier *v_client = cq_verifier_create(f.client_cq); grpc_metadata_array initial_metadata_recv; diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index 3d92b64ae4..0d680fcfe1 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -47,6 +47,8 @@ static grpc_call_error wait_for_deadline(grpc_call *call) { static const cancellation_mode cancellation_modes[] = { {"cancel", grpc_call_cancel, GRPC_STATUS_CANCELLED, ""}, - {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, "Deadline Exceeded"}, }; + {"deadline", wait_for_deadline, GRPC_STATUS_DEADLINE_EXCEEDED, + "Deadline Exceeded"}, +}; -#endif /* GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H */ +#endif /* GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H */ |