diff options
author | 2015-08-13 13:20:31 -0700 | |
---|---|---|
committer | 2015-08-13 13:20:31 -0700 | |
commit | 74f4f0bb4bb5ba4140fe9d5591a1fb61323cccd5 (patch) | |
tree | 8deac4dcaa738e9e1ad68c7be46a7a9cb9d35f31 /test/core | |
parent | 93dfab9c6ecfaa31a890c3b4657dfe5a515dacbf (diff) | |
parent | 118f65dc8c5df39872aff5f6bf269b16ce82c259 (diff) |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/end2end/tests/bad_hostname.c | 2 | ||||
-rw-r--r-- | test/core/security/verify_jwt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/bad_hostname.c b/test/core/end2end/tests/bad_hostname.c index 198ba46cd2..501db89b7b 100644 --- a/test/core/end2end/tests/bad_hostname.c +++ b/test/core/end2end/tests/bad_hostname.c @@ -146,7 +146,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); diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index 9b334b3c3e..69bbc3cc0c 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -112,7 +112,7 @@ int main(int argc, char **argv) { while (!sync.is_done) { grpc_pollset_worker worker; grpc_pollset_work(&sync.pollset, &worker, - gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(GRPC_POLLSET_MU(&sync.pollset)); |