From 6baa271142a8eb58f408be9fb2c6ac6c8d682a56 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 22 Aug 2023 07:23:07 -0400 Subject: [PATCH] Shorten wait time for a subscription not being ready. (#1092) We shouldn't wait around for 10 seconds for a subscription to not be ready; that can take literally forever. Instead, just wait one second. While we are in here, also make the case where we *are* waiting for a subscription to be ready more reactive by reducing the wait time to 100ms, with more tries. Signed-off-by: Chris Lalancette --- rcl/test/rcl/test_subscription.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rcl/test/rcl/test_subscription.cpp b/rcl/test/rcl/test_subscription.cpp index 6d773e954..2cf0ddbc9 100644 --- a/rcl/test/rcl/test_subscription.cpp +++ b/rcl/test/rcl/test_subscription.cpp @@ -984,9 +984,9 @@ TEST_F( } if (is_cft_support) { - ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 100)); } else { - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); test_msgs__msg__Strings msg; test_msgs__msg__Strings__init(&msg); @@ -1011,7 +1011,7 @@ TEST_F( ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; } - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); { test_msgs__msg__Strings msg; @@ -1072,9 +1072,9 @@ TEST_F( } if (is_cft_support) { - ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 100)); } else { - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); test_msgs__msg__Strings msg; test_msgs__msg__Strings__init(&msg); @@ -1099,7 +1099,7 @@ TEST_F( ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; } - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); { test_msgs__msg__Strings msg; @@ -1189,7 +1189,7 @@ TEST_F( ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; } - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); { test_msgs__msg__Strings msg; @@ -1261,7 +1261,7 @@ TEST_F( ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; } - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); { test_msgs__msg__BasicTypes msg; @@ -1323,9 +1323,9 @@ TEST_F( } if (is_cft_support) { - ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_FALSE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 100)); } else { - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); test_msgs__msg__BasicTypes msg; test_msgs__msg__BasicTypes__init(&msg); @@ -1349,7 +1349,7 @@ TEST_F( ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; } - ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 10, 1000)); + ASSERT_TRUE(wait_for_subscription_to_be_ready(&subscription, context_ptr, 100, 100)); { test_msgs__msg__BasicTypes msg;