Skip to content

Commit

Permalink
Increase the test_action_interaction timeouts. (#1172)
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@clalancette
clalancette committed Jul 25, 2024
1 parent 0723613 commit 5193dc6
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions rcl_action/test/rcl_action/test_action_interaction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 5193dc6

Please sign in to comment.