diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-04 07:20:44 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-04 07:20:44 -0700 |
| commit | 94ba7528830b7bc08476a70deca740dd19793943 (patch) | |
| tree | ac073c54969ab695925b6a7ddd2863767466b5d8 /test/cpp/grpclb | |
| parent | b34b055a40e66c625dc6271081c4b1bf5efa25cb (diff) | |
| parent | 9ab8ba73d6887ea902528426480dafb14b1c8214 (diff) | |
Merge remote-tracking branch 'upstream/master' into fake_resolver
Diffstat (limited to 'test/cpp/grpclb')
| -rw-r--r-- | test/cpp/grpclb/grpclb_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 41fa36880a..7666c4e60b 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -461,7 +461,7 @@ static void perform_request(client_fixture *cf) { c = grpc_channel_create_call(cf->client, NULL, GRPC_PROPAGATE_DEFAULTS, cf->cq, "/foo", "foo.test.google.fr:1234", - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1000), NULL); + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL); gpr_log(GPR_INFO, "Call 0x%" PRIxPTR " created", (intptr_t)c); GPR_ASSERT(c); char *peer; |