aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/end2end/dualstack_socket_test.cc
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2018-01-18 09:26:32 +0100
committerGravatar Jan Tattermusch <jtattermusch@google.com>2018-01-18 09:26:32 +0100
commit0f5f46109b995aab3bb5f8ffeadd96547de7e100 (patch)
tree49c9c69f9db86d61f7bfda96ca6e6737a76e88a2 /test/core/end2end/dualstack_socket_test.cc
parent816e8f7f43aff2f3ccba5c998587e92005645236 (diff)
use grpc_timeout_milliseconds_to_deadline directly
Diffstat (limited to 'test/core/end2end/dualstack_socket_test.cc')
-rw-r--r--test/core/end2end/dualstack_socket_test.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc
index 0c101d0f85..04c727e689 100644
--- a/test/core/end2end/dualstack_socket_test.cc
+++ b/test/core/end2end/dualstack_socket_test.cc
@@ -43,14 +43,11 @@
static void* tag(intptr_t i) { return (void*)i; }
-static gpr_timespec ms_from_now(int ms) {
- return grpc_timeout_milliseconds_to_deadline(ms);
-}
-
static void drain_cq(grpc_completion_queue* cq) {
grpc_event ev;
do {
- ev = grpc_completion_queue_next(cq, ms_from_now(5000), nullptr);
+ ev = grpc_completion_queue_next(
+ cq, grpc_timeout_milliseconds_to_deadline(5000), nullptr);
} while (ev.type != GRPC_QUEUE_SHUTDOWN);
}
@@ -165,11 +162,11 @@ void test_connect(const char* server_host, const char* client_host, int port,
if (expect_ok) {
/* Normal deadline, shouldn't be reached. */
- deadline = ms_from_now(60000);
+ deadline = grpc_timeout_milliseconds_to_deadline(60000);
} else {
/* Give up faster when failure is expected.
BUG: Setting this to 1000 reveals a memory leak (b/18608927). */
- deadline = ms_from_now(3000);
+ deadline = grpc_timeout_milliseconds_to_deadline(3000);
}
/* Send a trivial request. */