diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-02-01 16:12:08 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-02-01 16:12:08 -0800 |
| commit | 86d2115553bb0eaf0f02c78c9f1d7696c42f424c (patch) | |
| tree | c6515df23cecab3d8698257ba0dc9b17581185de /test/core/http | |
| parent | 5488d40bdd4b79fca8d0beeb0bcab126ae698996 (diff) | |
| parent | e042801b1c3154cbf37b62ccc54d334689d0b0ce (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'test/core/http')
| -rw-r--r-- | test/core/http/httpcli_test.c | 2 | ||||
| -rw-r--r-- | test/core/http/httpscli_test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/http/httpcli_test.c b/test/core/http/httpcli_test.c index fbf696f65e..5ee7729f2a 100644 --- a/test/core/http/httpcli_test.c +++ b/test/core/http/httpcli_test.c @@ -51,7 +51,7 @@ static gpr_mu *g_mu; static grpc_polling_entity g_pops; static gpr_timespec n_seconds_time(int seconds) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds); + return grpc_timeout_seconds_to_deadline(seconds); } static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { diff --git a/test/core/http/httpscli_test.c b/test/core/http/httpscli_test.c index 67a9a6798a..5e938b54ef 100644 --- a/test/core/http/httpscli_test.c +++ b/test/core/http/httpscli_test.c @@ -51,7 +51,7 @@ static gpr_mu *g_mu; static grpc_polling_entity g_pops; static gpr_timespec n_seconds_time(int seconds) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds); + return grpc_timeout_seconds_to_deadline(seconds); } static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { |