Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add test of cancelling ops when :authority exists but not supported

Browse Source
pull/8343/head
Muxi Yan 8 years ago
parent 81f8d2e51c
commit fbe175308d
5 changed files with 214 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 8
      test/core/end2end/end2end_nosec_tests.c
  3. 8
      test/core/end2end/end2end_tests.c
  4. 1
      test/core/end2end/gen_build_yaml.py
  5. 195
      test/core/end2end/tests/authority_not_supported.c

2
Makefile
Unescape View File

@ -6616,6 +6616,7 @@ LIBEND2END_TESTS_SRC = \
test/core/end2end/tests/simple_request.c \ test/core/end2end/tests/simple_request.c \
test/core/end2end/tests/streaming_error_response.c \ test/core/end2end/tests/streaming_error_response.c \
test/core/end2end/tests/trailing_metadata.c \ test/core/end2end/tests/trailing_metadata.c \
test/core/end2end/tests/authority_not_supported.c \
PUBLIC_HEADERS_C += \ PUBLIC_HEADERS_C += \
@ -6698,6 +6699,7 @@ LIBEND2END_NOSEC_TESTS_SRC = \
test/core/end2end/tests/simple_request.c \ test/core/end2end/tests/simple_request.c \
test/core/end2end/tests/streaming_error_response.c \ test/core/end2end/tests/streaming_error_response.c \
test/core/end2end/tests/trailing_metadata.c \ test/core/end2end/tests/trailing_metadata.c \
test/core/end2end/tests/authority_not_supported.c \
PUBLIC_HEADERS_C += \ PUBLIC_HEADERS_C += \

8
test/core/end2end/end2end_nosec_tests.c
Unescape View File

@ -129,6 +129,8 @@ extern void streaming_error_response(grpc_end2end_test_config config);
extern void streaming_error_response_pre_init(void); extern void streaming_error_response_pre_init(void);
extern void trailing_metadata(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config);
extern void trailing_metadata_pre_init(void); extern void trailing_metadata_pre_init(void);
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
void grpc_end2end_tests_pre_init(void) { void grpc_end2end_tests_pre_init(void) {
GPR_ASSERT(!g_pre_init_called); GPR_ASSERT(!g_pre_init_called);
@ -176,6 +178,7 @@ void grpc_end2end_tests_pre_init(void) {
simple_request_pre_init(); simple_request_pre_init();
streaming_error_response_pre_init(); streaming_error_response_pre_init();
trailing_metadata_pre_init(); trailing_metadata_pre_init();
authority_not_supported_pre_init();
} }
void grpc_end2end_tests(int argc, char **argv, void grpc_end2end_tests(int argc, char **argv,
@ -228,6 +231,7 @@ void grpc_end2end_tests(int argc, char **argv,
simple_request(config); simple_request(config);
streaming_error_response(config); streaming_error_response(config);
trailing_metadata(config); trailing_metadata(config);
authority_not_supported(config);
return; return;
} }
@ -404,6 +408,10 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config); trailing_metadata(config);
continue; continue;
} }
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort(); abort();
} }

8
test/core/end2end/end2end_tests.c
Unescape View File

@ -131,6 +131,8 @@ extern void streaming_error_response(grpc_end2end_test_config config);
extern void streaming_error_response_pre_init(void); extern void streaming_error_response_pre_init(void);
extern void trailing_metadata(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config);
extern void trailing_metadata_pre_init(void); extern void trailing_metadata_pre_init(void);
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
void grpc_end2end_tests_pre_init(void) { void grpc_end2end_tests_pre_init(void) {
GPR_ASSERT(!g_pre_init_called); GPR_ASSERT(!g_pre_init_called);
@ -179,6 +181,7 @@ void grpc_end2end_tests_pre_init(void) {
simple_request_pre_init(); simple_request_pre_init();
streaming_error_response_pre_init(); streaming_error_response_pre_init();
trailing_metadata_pre_init(); trailing_metadata_pre_init();
authority_not_supported_pre_init();
} }
void grpc_end2end_tests(int argc, char **argv, void grpc_end2end_tests(int argc, char **argv,
@ -232,6 +235,7 @@ void grpc_end2end_tests(int argc, char **argv,
simple_request(config); simple_request(config);
streaming_error_response(config); streaming_error_response(config);
trailing_metadata(config); trailing_metadata(config);
authority_not_supported(config);
return; return;
} }
@ -412,6 +416,10 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config); trailing_metadata(config);
continue; continue;
} }
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort(); abort();
} }

1
test/core/end2end/gen_build_yaml.py
Unescape View File

@ -134,6 +134,7 @@ END2END_TESTS = {
'simple_request': default_test_options, 'simple_request': default_test_options,
'streaming_error_response': default_test_options, 'streaming_error_response': default_test_options,
'trailing_metadata': default_test_options, 'trailing_metadata': default_test_options,
'authority_not_supported': default_test_options,
} }

195
test/core/end2end/tests/authority_not_supported.c
Unescape View File

@ -0,0 +1,195 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "test/core/end2end/end2end_tests.h"
#include <stdio.h>
#include <string.h>
#include <grpc/byte_buffer.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/time.h>
#include <grpc/support/useful.h>
#include "test/core/end2end/cq_verifier.h"
static void *tag(intptr_t t) { return (void *)t; }
static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config,
const char *test_name,
grpc_channel_args *client_args,
grpc_channel_args *server_args) {
grpc_end2end_test_fixture f;
gpr_log(GPR_INFO, "%s/%s", test_name, config.name);
f = config.create_fixture(client_args, server_args);
config.init_server(&f, server_args);
config.init_client(&f, client_args);
return f;
}
static gpr_timespec n_seconds_time(int n) {
return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n);
}
static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); }
static void drain_cq(grpc_completion_queue *cq) {
grpc_event ev;
do {
ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL);
} while (ev.type != GRPC_QUEUE_SHUTDOWN);
}
static void shutdown_server(grpc_end2end_test_fixture *f) {
if (!f->server) return;
grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
GPR_ASSERT(grpc_completion_queue_pluck(
f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL)
.type == GRPC_OP_COMPLETE);
grpc_server_destroy(f->server);
f->server = NULL;
}
static void shutdown_client(grpc_end2end_test_fixture *f) {
if (!f->client) return;
grpc_channel_destroy(f->client);
f->client = NULL;
}
static void end_test(grpc_end2end_test_fixture *f) {
shutdown_server(f);
shutdown_client(f);
grpc_completion_queue_shutdown(f->cq);
drain_cq(f->cq);
grpc_completion_queue_destroy(f->cq);
}
/* Request/response with metadata and payload.*/
static void test_with_authority_header(
grpc_end2end_test_config config) {
grpc_call *c;
gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world");
grpc_byte_buffer *request_payload =
grpc_raw_byte_buffer_create(&request_payload_slice, 1);
gpr_timespec deadline = five_seconds_time();
grpc_metadata meta_c[2] = {
{"key1", "val1", 4, 0, {{NULL, NULL, NULL, NULL}}},
{"key2", "val2", 4, 0, {{NULL, NULL, NULL, NULL}}}};
grpc_end2end_test_fixture f = begin_test(
config, "test_with_authority_header", NULL, NULL);
cq_verifier *cqv = cq_verifier_create(f.cq);
grpc_op ops[6];
grpc_op *op;
grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_byte_buffer *response_payload_recv = NULL;
grpc_status_code status;
grpc_call_error error;
char *details = NULL;
size_t details_capacity = 0;
c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
"/foo", "foo.test.google.fr", deadline, NULL);
GPR_ASSERT(c);
grpc_metadata_array_init(&initial_metadata_recv);
grpc_metadata_array_init(&trailing_metadata_recv);
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 2;
op->data.send_initial_metadata.metadata = meta_c;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message = request_payload;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message = &response_payload_recv;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op->flags = 0;
op->reserved = NULL;
op++;
error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL);
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(1), 1);
cq_verify(cqv);
GPR_ASSERT(status == GRPC_STATUS_CANCELLED);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_call_destroy(c);
cq_verifier_destroy(cqv);
grpc_byte_buffer_destroy(request_payload);
grpc_byte_buffer_destroy(response_payload_recv);
end_test(&f);
config.tear_down_data(&f);
}
void authority_not_supported(grpc_end2end_test_config config) {
if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) {
return;
}
test_with_authority_header(config);
}
void authority_not_supported_pre_init(void) {}
Write Preview
Loading…
Cancel
Save