diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-03 11:54:26 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-03 11:54:26 -0800 |
| commit | c40b34745ac5aac3cb9954d2b9fa52edb99202de (patch) | |
| tree | 76e41c4ef0d84b8f6b837a032d882be97df5d2ab /test/core/end2end/tests/connectivity.c | |
| parent | 9a3997c8537d168f4b869c3912994c2dc6f476ba (diff) | |
| parent | 4fd2bf6ec964dae973040984e5b5b387fe2f72e1 (diff) | |
Merge branch 'bwest' into assert_writes
Diffstat (limited to 'test/core/end2end/tests/connectivity.c')
| -rw-r--r-- | test/core/end2end/tests/connectivity.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core/end2end/tests/connectivity.c b/test/core/end2end/tests/connectivity.c index 42475c7331..979419a100 100644 --- a/test/core/end2end/tests/connectivity.c +++ b/test/core/end2end/tests/connectivity.c @@ -89,7 +89,7 @@ static void test_connectivity(grpc_end2end_test_config config) { /* channels should start life in IDLE, and stay there */ GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == GRPC_CHANNEL_IDLE); - gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100)); + gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(100)); GPR_ASSERT(grpc_channel_check_connectivity_state(f.client, 0) == GRPC_CHANNEL_IDLE); @@ -106,7 +106,7 @@ static void test_connectivity(grpc_end2end_test_config config) { GRPC_CHANNEL_IDLE); /* start watching for a change */ grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_IDLE, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + grpc_timeout_seconds_to_deadline(3), f.cq, tag(2)); /* and now the watch should trigger */ @@ -118,7 +118,7 @@ static void test_connectivity(grpc_end2end_test_config config) { /* quickly followed by a transition to TRANSIENT_FAILURE */ grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_CONNECTING, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + grpc_timeout_seconds_to_deadline(3), f.cq, tag(3)); CQ_EXPECT_COMPLETION(cqv, tag(3), 1); cq_verify(cqv); @@ -137,7 +137,7 @@ static void test_connectivity(grpc_end2end_test_config config) { READY is reached */ while (state != GRPC_CHANNEL_READY) { grpc_channel_watch_connectivity_state( - f.client, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), f.cq, tag(4)); + f.client, state, grpc_timeout_seconds_to_deadline(3), f.cq, tag(4)); CQ_EXPECT_COMPLETION(cqv, tag(4), 1); cq_verify(cqv); state = grpc_channel_check_connectivity_state(f.client, 0); @@ -151,7 +151,7 @@ static void test_connectivity(grpc_end2end_test_config config) { gpr_log(GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_READY, - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), + grpc_timeout_seconds_to_deadline(3), f.cq, tag(5)); grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); |