diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 23:13:19 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 23:13:19 -0700 |
| commit | d9a60bbd2628f9a19e7bf0ff97c5c156dded73cf (patch) | |
| tree | 42e57e6117246be7241a4d09e87c39f24615b447 /test/core/end2end/tests/default_host.c | |
| parent | c22781525c1113ae04496f49a5f5fa10fea96534 (diff) | |
| parent | afbae1f583b9b34b60a975c0cee7b336399ade8b (diff) | |
Merge branch 'cleaner-posix2' into cleaner-posix3
Diffstat (limited to 'test/core/end2end/tests/default_host.c')
| -rw-r--r-- | test/core/end2end/tests/default_host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core/end2end/tests/default_host.c b/test/core/end2end/tests/default_host.c index dc3303436b..576d81e395 100644 --- a/test/core/end2end/tests/default_host.c +++ b/test/core/end2end/tests/default_host.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,13 +36,13 @@ #include <stdio.h> #include <string.h> -#include "src/core/support/string.h" #include <grpc/byte_buffer.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/time.h> #include <grpc/support/useful.h> +#include "src/core/lib/support/string.h" #include "test/core/end2end/cq_verifier.h" enum { TIMEOUT = 200000 }; @@ -77,9 +77,9 @@ static void drain_cq(grpc_completion_queue *cq) { 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); + 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; } |