From b86defb86dcd9ce90773424606166a409a8248e3 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Thu, 25 Jul 2024 15:27:52 +0000 Subject: [PATCH] Increase the test_action_interaction timeouts. While I can't reproduce the problem locally, I suspect that waiting only 1 second for the entities to become ready isn't enough in all cases, particularly on Windows, with Connext, and when we are running in parallel with other tests. Thus, increase the timeout for the rcl_wait() in all of the test_action_interaction tests, which should hopefully be enough to make this always pass. Signed-off-by: Chris Lalancette --- .../rcl_action/test_action_interaction.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rcl_action/test/rcl_action/test_action_interaction.cpp b/rcl_action/test/rcl_action/test_action_interaction.cpp index 0e9ba0342..6e879bca1 100644 --- a/rcl_action/test/rcl_action/test_action_interaction.cpp +++ b/rcl_action/test/rcl_action/test_action_interaction.cpp @@ -218,7 +218,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for goal request to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_server_wait_set_get_entities_ready( @@ -265,7 +265,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for goal response to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -324,7 +324,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for feedback to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -368,7 +368,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for result request to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_server_wait_set_get_entities_ready( @@ -420,7 +420,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for result response to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -490,7 +490,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for goal request to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_server_wait_set_get_entities_ready( @@ -537,7 +537,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for goal response to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -596,7 +596,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for feedback to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -640,7 +640,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for result request to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_server_wait_set_get_entities_ready( @@ -696,7 +696,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ret = rcl_action_wait_set_add_action_server(&this->wait_set, &this->action_server, NULL); ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_server_wait_set_get_entities_ready( @@ -748,7 +748,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) &this->wait_set, &this->action_client, NULL, NULL); ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready( @@ -799,7 +799,7 @@ TEST_F(TestActionClientServerInteraction, test_interaction_with_cancel) ASSERT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; // Wait for result response to be ready - ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(1)); + ret = rcl_wait(&this->wait_set, RCL_S_TO_NS(10)); EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str; ret = rcl_action_client_wait_set_get_entities_ready(