diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 19:20:39 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 19:20:39 +0200 |
| commit | d53b389607dd1c1bb1be634824f3eabd411b2a29 (patch) | |
| tree | e423ee6459f9b2680d234156fc61ef70e4046e55 /test/core | |
| parent | d9745cab08c168db07afb4b2a6499f51123a67c9 (diff) | |
| parent | 58d7310fbc291d2afa9cbb100544fc5c96cd3249 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
src/cpp/client/channel.cc
src/cpp/client/client_context.cc
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/end2end/tests/bad_hostname.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/tests/bad_hostname.c b/test/core/end2end/tests/bad_hostname.c index 1ff2c704ea..61bbbe4855 100644 --- a/test/core/end2end/tests/bad_hostname.c +++ b/test/core/end2end/tests/bad_hostname.c @@ -153,7 +153,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) { cq_expect_completion(cqv, tag(1), 1); cq_verify(cqv); - GPR_ASSERT(status == GRPC_STATUS_UNAUTHENTICATED); + GPR_ASSERT(status == GRPC_STATUS_INVALID_ARGUMENT); gpr_free(details); grpc_metadata_array_destroy(&initial_metadata_recv); |