From 7b01878736840395f13244bd68edaf0d88b4c3e4 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 16 Jan 2015 09:53:39 -0800 Subject: Fix returned status The client should return status deadline exceeded when the deadline is exceeded (not cancelled status) --- test/core/end2end/tests/cancel_after_invoke.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'test/core/end2end/tests/cancel_after_invoke.c') diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 3c9122944b..d4cb5e4f13 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -43,14 +43,7 @@ #include #include #include "test/core/end2end/cq_verifier.h" - -/* allow cancellation by either grpc_call_cancel, or by wait_for_deadline (which - * does nothing) */ -typedef grpc_call_error (*canceller)(grpc_call *call); - -static grpc_call_error wait_for_deadline(grpc_call *call) { - return GRPC_CALL_OK; -} +#include "test/core/end2end/tests/cancel_test_helpers.h" enum { TIMEOUT = 200000 }; @@ -112,7 +105,7 @@ static void end_test(grpc_end2end_test_fixture *f) { /* Cancel after invoke, no payload */ static void test_cancel_after_invoke(grpc_end2end_test_config config, - canceller call_cancel) { + cancellation_mode mode) { grpc_call *c; grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL); gpr_timespec deadline = five_seconds_time(); @@ -126,11 +119,11 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, cq_expect_invoke_accepted(v_client, tag(1), GRPC_OP_OK); cq_verify(v_client); - GPR_ASSERT(GRPC_CALL_OK == call_cancel(c)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c)); cq_expect_client_metadata_read(v_client, tag(2), NULL); - cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_CANCELLED, NULL, - NULL); + cq_expect_finished_with_status(v_client, tag(3), mode.expect_status, + mode.expect_details, NULL); cq_verify(v_client); grpc_call_destroy(c); @@ -142,9 +135,8 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, void grpc_end2end_tests(grpc_end2end_test_config config) { int i; - canceller cancellers[2] = {grpc_call_cancel, wait_for_deadline}; - for (i = 0; i < GPR_ARRAY_SIZE(cancellers); i++) { - test_cancel_after_invoke(config, cancellers[i]); + for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { + test_cancel_after_invoke(config, cancellation_modes[i]); } } -- cgit v1.2.3