Add a registered server method to bad_client

pull/4453/head
Craig Tiller 9 years ago
parent 0bdc3a58f6
commit ac3220b0d9
  1. 4
      test/core/bad_client/bad_client.c
  2. 6
      test/core/bad_client/bad_client.h
  3. 2
      test/core/bad_client/tests/badreq.c
  4. 2
      test/core/bad_client/tests/connection_prefix.c
  5. 2
      test/core/bad_client/tests/headers.c
  6. 2
      test/core/bad_client/tests/initial_settings_frame.c
  7. 4
      test/core/bad_client/tests/simple_request.c
  8. 2
      test/core/bad_client/tests/unknown_frame.c

@ -49,13 +49,14 @@ typedef struct {
grpc_server *server;
grpc_completion_queue *cq;
grpc_bad_client_server_side_validator validator;
void *registered_method;
gpr_event done_thd;
gpr_event done_write;
} thd_args;
static void thd_func(void *arg) {
thd_args *a = arg;
a->validator(a->server, a->cq);
a->validator(a->server, a->cq, a->registered_method);
gpr_event_set(&a->done_thd, (void *)1);
}
@ -110,6 +111,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator,
gpr_event_init(&a.done_write);
a.validator = validator;
grpc_server_register_completion_queue(a.server, a.cq, NULL);
a.registered_method = grpc_server_register_method(a.server, GRPC_BAD_CLIENT_REGISTERED_METHOD, GRPC_BAD_CLIENT_REGISTERED_HOST);
grpc_server_start(a.server);
transport = grpc_create_chttp2_transport(&exec_ctx, NULL, sfd.server, 0);
server_setup_transport(&a, transport);

@ -37,8 +37,12 @@
#include <grpc/grpc.h>
#include "test/core/util/test_config.h"
#define GRPC_BAD_CLIENT_REGISTERED_METHOD "/Foo/bar"
#define GRPC_BAD_CLIENT_REGISTERED_HOST "test"
typedef void (*grpc_bad_client_server_side_validator)(
grpc_server *server, grpc_completion_queue *cq);
grpc_server *server, grpc_completion_queue *cq,
void *registered_method);
#define GRPC_BAD_CLIENT_DISCONNECT 1

@ -42,7 +42,7 @@
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
"\x00\x00\x00\x04\x00\x00\x00\x00\x00" /* settings frame */
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

@ -34,7 +34,7 @@
#include "test/core/bad_client/bad_client.h"
#include "src/core/surface/server.h"
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

@ -38,7 +38,7 @@
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
"\x00\x00\x00\x04\x00\x00\x00\x00\x00"
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

@ -37,7 +37,7 @@
#define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
#define ONE_SETTING_HDR "\x00\x00\x06\x04\x00\x00\x00\x00\x00"
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

@ -79,7 +79,7 @@
static void *tag(gpr_intptr t) { return (void *)t; }
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
grpc_call_error error;
grpc_call *s;
grpc_call_details call_details;
@ -104,7 +104,7 @@ static void verifier(grpc_server *server, grpc_completion_queue *cq) {
cq_verifier_destroy(cqv);
}
static void failure_verifier(grpc_server *server, grpc_completion_queue *cq) {
static void failure_verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

@ -38,7 +38,7 @@
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
"\x00\x00\x00\x04\x00\x00\x00\x00\x00"
static void verifier(grpc_server *server, grpc_completion_queue *cq) {
static void verifier(grpc_server *server, grpc_completion_queue *cq, void *registered_method) {
while (grpc_server_has_open_connections(server)) {
GPR_ASSERT(grpc_completion_queue_next(cq,
GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20),

Loading…
Cancel
Save