From b00988134ddfe2e3fbd8178124fd41981b84ae41 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:23:51 +0200 Subject: [PATCH] Fix spawner tests timeout on source builds (backport #1692) (#1697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix spawner tests timeout (#1692) (cherry picked from commit 079392b94867c3372c0050492327001057118090) # Conflicts: # controller_manager/test/test_spawner_unspawner.cpp * Fix merge conflicts --------- Co-authored-by: Sai Kishor Kothakota Co-authored-by: Christoph Fröhlich --- controller_manager/test/test_spawner_unspawner.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 2bda6d6431..c83f777cfa 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -221,6 +221,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( @@ -239,6 +240,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) + @@ -507,6 +509,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( @@ -567,6 +570,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(