From f75fc12e3a1a614ee2d5d565742764e47d9aef96 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 25 Jun 2015 06:58:00 -0700 Subject: Add a test that headers are properly in build.json Clean up anything that failed --- test/core/bad_client/gen_build_json.py | 9 +++++++++ test/core/end2end/gen_build_json.py | 34 ++++++++++++++++++++-------------- test/cpp/qps/qps_worker.cc | 2 +- test/cpp/qps/worker.cc | 2 +- 4 files changed, 31 insertions(+), 16 deletions(-) (limited to 'test') diff --git a/test/core/bad_client/gen_build_json.py b/test/core/bad_client/gen_build_json.py index a6fa266bec..33bf65ac04 100755 --- a/test/core/bad_client/gen_build_json.py +++ b/test/core/bad_client/gen_build_json.py @@ -54,6 +54,15 @@ def main(): 'language': 'c', 'src': [ 'test/core/bad_client/bad_client.c' + ], + 'headers': [ + 'test/core/bad_client/bad_client.h' + ], + 'deps': [ + 'grpc_test_util_unsecure', + 'grpc_unsecure', + 'gpr_test_util', + 'gpr' ] }], 'targets': [ diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py index f47c92bc47..f1c7e85e08 100755 --- a/test/core/end2end/gen_build_json.py +++ b/test/core/end2end/gen_build_json.py @@ -93,6 +93,19 @@ END2END_TESTS = { def main(): + sec_deps = [ + 'end2end_certs', + 'grpc_test_util', + 'grpc', + 'gpr_test_util', + 'gpr' + ] + unsec_deps = [ + 'grpc_test_util_unsecure', + 'grpc_unsecure', + 'gpr_test_util', + 'gpr' + ] json = { '#': 'generated with test/end2end/gen_build_json.py', 'libs': [ @@ -103,6 +116,8 @@ def main(): 'secure': 'check' if END2END_FIXTURES[f].secure else 'no', 'src': ['test/core/end2end/fixtures/%s.c' % f], 'platforms': [ 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms, + 'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps, + 'headers': ['test/core/end2end/end2end_tests.h'], } for f in sorted(END2END_FIXTURES.keys())] + [ { @@ -111,7 +126,9 @@ def main(): 'language': 'c', 'secure': 'check' if END2END_TESTS[t].secure else 'no', 'src': ['test/core/end2end/tests/%s.c' % t], - 'headers': ['test/core/end2end/tests/cancel_test_helpers.h'] + 'headers': ['test/core/end2end/tests/cancel_test_helpers.h', + 'test/core/end2end/end2end_tests.h'], + 'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps } for t in sorted(END2END_TESTS.keys())] + [ { @@ -135,13 +152,7 @@ def main(): 'platforms': END2END_FIXTURES[f].platforms, 'deps': [ 'end2end_fixture_%s' % f, - 'end2end_test_%s' % t, - 'end2end_certs', - 'grpc_test_util', - 'grpc', - 'gpr_test_util', - 'gpr' - ] + 'end2end_test_%s' % t] + sec_deps } for f in sorted(END2END_FIXTURES.keys()) for t in sorted(END2END_TESTS.keys())] + [ @@ -155,12 +166,7 @@ def main(): 'platforms': END2END_FIXTURES[f].platforms, 'deps': [ 'end2end_fixture_%s' % f, - 'end2end_test_%s' % t, - 'grpc_test_util_unsecure', - 'grpc_unsecure', - 'gpr_test_util', - 'gpr' - ] + 'end2end_test_%s' % t] + unsec_deps } for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure for t in sorted(END2END_TESTS.keys()) if not END2END_TESTS[t].secure]} diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 423275ee85..f1cea5ee66 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -31,7 +31,7 @@ * */ -#include "qps_worker.h" +#include "test/cpp/qps/qps_worker.h" #include #include diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc index dfc102fc17..14a8b0b089 100644 --- a/test/cpp/qps/worker.cc +++ b/test/cpp/qps/worker.cc @@ -40,7 +40,7 @@ #include #include -#include "qps_worker.h" +#include "test/cpp/qps/qps_worker.h" #include "test/cpp/util/test_config.h" DEFINE_int32(driver_port, 0, "Driver server port."); -- cgit v1.2.3 From 0b6ad7d4bc686c78995a830cccb39a7de2a929ae Mon Sep 17 00:00:00 2001 From: yang-g Date: Thu, 25 Jun 2015 14:39:01 -0700 Subject: Bug fix. Do not push to incoming_queue after it is flushed. --- src/core/surface/call.c | 18 +++++++++++------- test/cpp/end2end/end2end_test.cc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/src/core/surface/call.c b/src/core/surface/call.c index dd8eaa943e..549ef8ca0d 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -156,6 +156,9 @@ struct grpc_call { gpr_uint8 reading_message; /* have we bound a pollset yet? */ gpr_uint8 bound_pollset; + /* is an error status set */ + gpr_uint8 error_status_set; + /* flags with bits corresponding to write states allowing us to determine what was sent */ gpr_uint16 last_send_contains; @@ -214,7 +217,7 @@ struct grpc_call { /* Received call statuses from various sources */ received_status status[STATUS_SOURCE_COUNT]; - /** Compression level for the call */ + /* Compression level for the call */ grpc_compression_level compression_level; /* Contexts for various subsystems (security, tracing, ...). */ @@ -409,6 +412,7 @@ static void set_status_code(grpc_call *call, status_source source, call->status[source].is_set = 1; call->status[source].code = status; + call->error_status_set = status != GRPC_STATUS_OK; if (status != GRPC_STATUS_OK && !grpc_bbq_empty(&call->incoming_queue)) { grpc_bbq_flush(&call->incoming_queue); @@ -686,13 +690,13 @@ static void call_on_done_send(void *pc, int success) { } static void finish_message(grpc_call *call) { - /* TODO(ctiller): this could be a lot faster if coded directly */ - grpc_byte_buffer *byte_buffer = grpc_raw_byte_buffer_create( - call->incoming_message.slices, call->incoming_message.count); + if (call->error_status_set == 0) { + /* TODO(ctiller): this could be a lot faster if coded directly */ + grpc_byte_buffer *byte_buffer = grpc_raw_byte_buffer_create( + call->incoming_message.slices, call->incoming_message.count); + grpc_bbq_push(&call->incoming_queue, byte_buffer); + } gpr_slice_buffer_reset_and_unref(&call->incoming_message); - - grpc_bbq_push(&call->incoming_queue, byte_buffer); - GPR_ASSERT(call->incoming_message.count == 0); call->reading_message = 0; } diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 45ba8b0878..5e850ea30a 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -68,6 +68,8 @@ namespace testing { namespace { +const char* kServerCancelAfterReads = "cancel_after_reads"; + // When echo_deadline is requested, deadline seen in the ServerContext is set in // the response in seconds. void MaybeEchoDeadline(ServerContext* context, const EchoRequest* request, @@ -131,7 +133,23 @@ class TestServiceImpl : public ::grpc::cpp::test::util::TestService::Service { EchoResponse* response) GRPC_OVERRIDE { EchoRequest request; response->set_message(""); + int cancel_after_reads = 0; + const std::multimap client_initial_metadata = + context->client_metadata(); + if (client_initial_metadata.find(kServerCancelAfterReads) != + client_initial_metadata.end()) { + std::istringstream iss( + client_initial_metadata.find(kServerCancelAfterReads)->second); + iss >> cancel_after_reads; + gpr_log(GPR_INFO, "cancel_after_reads %d", cancel_after_reads); + } while (reader->Read(&request)) { + if (cancel_after_reads == 1) { + gpr_log(GPR_INFO, "return cancel status"); + return Status::CANCELLED; + } else if (cancel_after_reads > 0) { + cancel_after_reads--; + } response->mutable_message()->append(request.message()); } return Status::OK; @@ -687,6 +705,27 @@ TEST_F(End2endTest, OverridePerCallCredentials) { EXPECT_TRUE(s.ok()); } +// Client sends 20 requests and the server returns CANCELLED status after +// reading 10 requests. +TEST_F(End2endTest, RequestStreamServerEarlyCancelTest) { + ResetStub(); + EchoRequest request; + EchoResponse response; + ClientContext context; + + context.AddMetadata(kServerCancelAfterReads, "10"); + auto stream = stub_->RequestStream(&context, &response); + request.set_message("hello"); + int send_messages = 20; + while (send_messages > 0) { + EXPECT_TRUE(stream->Write(request)); + send_messages--; + } + stream->WritesDone(); + Status s = stream->Finish(); + EXPECT_EQ(s.error_code(), StatusCode::CANCELLED); +} + } // namespace testing } // namespace grpc -- cgit v1.2.3