Skip to content

Commit

Permalink
Fix spawner tests timeout on source builds (backport #1692) (#1698)
Browse files Browse the repository at this point in the history
* Fix spawner tests timeout (#1692)

(cherry picked from commit 079392b)

# Conflicts:
#	controller_manager/test/test_spawner_unspawner.cpp

* Fix merge conflicts

---------

Co-authored-by: Sai Kishor Kothakota <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
  • Loading branch information
3 people authored Oct 8, 2024
1 parent 7f20d16 commit 1268cf6
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions controller_manager/test/test_spawner_unspawner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ TEST_F(TestLoadController, multi_ctrls_test_type_in_param)

TEST_F(TestLoadController, spawner_test_type_in_arg)
{
ControllerManagerRunner cm_runner(this);
// Provide controller type via -t argument
EXPECT_EQ(
call_spawner(
Expand All @@ -270,6 +271,7 @@ TEST_F(TestLoadController, unload_on_kill)
{
// Launch spawner with unload on kill
// timeout command will kill it after the specified time with signal SIGINT
ControllerManagerRunner cm_runner(this);
std::stringstream ss;
ss << "timeout --signal=INT 5 "
<< std::string(coveragepy_script) +
Expand Down Expand Up @@ -538,6 +540,7 @@ TEST_F(TestLoadControllerWithNamespacedCM, spawner_test_type_in_params_file)
const std::string test_file_path = ament_index_cpp::get_package_prefix("controller_manager") +
"/test/test_controller_spawner_with_type.yaml";

ControllerManagerRunner cm_runner(this);
// Provide controller type via the parsed file
EXPECT_EQ(
call_spawner(
Expand Down Expand Up @@ -598,6 +601,7 @@ TEST_F(
const std::string test_file_path = ament_index_cpp::get_package_prefix("controller_manager") +
"/test/test_controller_spawner_with_type.yaml";

ControllerManagerRunner cm_runner(this);
// Provide controller type via the parsed file
EXPECT_EQ(
call_spawner(
Expand Down

0 comments on commit 1268cf6

Please sign in to comment.