diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-04-03 10:34:07 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-03 10:34:07 -0700 |
| commit | 5b5fdb7349bb886f758ec74abe505ca90578467f (patch) | |
| tree | 90ebeb1db94b65201ecc818bbee358827472f5bc /test/core/http/httpscli_test.c | |
| parent | cbe5036bb74d4e141f79b052e1325dd550867969 (diff) | |
| parent | 891b5922edb22f5b388dc540ba83e1486a359123 (diff) | |
Merge branch 'master' into node_protobuf_js_6_upgrade
Diffstat (limited to 'test/core/http/httpscli_test.c')
| -rw-r--r-- | test/core/http/httpscli_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/http/httpscli_test.c b/test/core/http/httpscli_test.c index 549411037e..acc94091f4 100644 --- a/test/core/http/httpscli_test.c +++ b/test/core/http/httpscli_test.c @@ -103,7 +103,7 @@ static void test_get(int port) { "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20)))); + n_seconds_time(1)))); gpr_mu_unlock(g_mu); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); @@ -146,7 +146,7 @@ static void test_post(int port) { "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker, gpr_now(GPR_CLOCK_MONOTONIC), - n_seconds_time(20)))); + n_seconds_time(1)))); gpr_mu_unlock(g_mu); grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); |