diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
| commit | 8bec6f6a55afaa1e321f29bf816d2a010f510b3c (patch) | |
| tree | 525e06b564b9d23d8340e25e7ddb9915fec0b1e5 /test/core/end2end/tests | |
| parent | 582f4350ed755aac0b07f12b499ad18f86f2a1b7 (diff) | |
| parent | 0d6196025e62aea5aabc6341459f2c370e264230 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
Diffstat (limited to 'test/core/end2end/tests')
| -rw-r--r-- | test/core/end2end/tests/call_creds.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/tests/request_with_flags.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/call_creds.c b/test/core/end2end/tests/call_creds.c index b555bea740..5c6791f6f7 100644 --- a/test/core/end2end/tests/call_creds.c +++ b/test/core/end2end/tests/call_creds.c @@ -42,7 +42,7 @@ #include <grpc/support/log.h> #include <grpc/support/time.h> #include <grpc/support/useful.h> -#include "src/core/lib/security/credentials.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/support/string.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/tests/request_with_flags.c b/test/core/end2end/tests/request_with_flags.c index 779895b970..f5a8d4d60c 100644 --- a/test/core/end2end/tests/request_with_flags.c +++ b/test/core/end2end/tests/request_with_flags.c @@ -105,7 +105,7 @@ static void test_invoke_request_with_flags( 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 = GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10); + gpr_timespec deadline = five_seconds_time(); grpc_end2end_test_fixture f = begin_test(config, "test_invoke_request_with_flags", NULL, NULL); cq_verifier *cqv = cq_verifier_create(f.cq); |