diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-24 15:05:11 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-24 15:31:59 -0700 |
| commit | e4f7c2fd13b8e417ec04abcc06c162c607cadfd8 (patch) | |
| tree | e2932474936530c8816107e9ffee30f9c1656f1d /test/core/httpcli/httpcli_test.c | |
| parent | d09bae5b488cc235b11d4c2446accaf3160322c7 (diff) | |
| parent | d7af736794fcdc3b8dd1ffda4a97f12b58e326c8 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-accept-encoding
Diffstat (limited to 'test/core/httpcli/httpcli_test.c')
| -rw-r--r-- | test/core/httpcli/httpcli_test.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 8dddfbee98..42b2661c0a 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -88,7 +88,8 @@ static void test_get(int use_ssl, int port) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, n_seconds_time(20)); + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + n_seconds_time(20)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_free(host); @@ -114,7 +115,8 @@ static void test_post(int use_ssl, int port) { gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (!g_done) { grpc_pollset_worker worker; - grpc_pollset_work(&g_pollset, &worker, n_seconds_time(20)); + grpc_pollset_work(&g_pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), + n_seconds_time(20)); } gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); gpr_free(host); |