Merge branch 'master' into add-namespaced-controllers

hellantos · web-flow · commit 01bf8d7238f5 · 2023-07-07T15:11:38.000+02:00
diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp
@@ -96,6 +96,7 @@ TEST_F(TestLoadController, spawner_test_type_in_param)
 {
   cm_->set_parameter(rclcpp::Parameter("ctrl_1.type", test_controller::TEST_CONTROLLER_CLASS_NAME));
 
+  ControllerManagerRunner cm_runner(this);
   EXPECT_EQ(call_spawner("ctrl_1 -c test_controller_manager"), 0);
 
   ASSERT_EQ(cm_->get_loaded_controllers().size(), 1ul);

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ TEST_F(TestLoadController, spawner_test_type_in_param)`
`96`	`96`	`{`
`97`	`97`	`cm_->set_parameter(rclcpp::Parameter("ctrl_1.type", test_controller::TEST_CONTROLLER_CLASS_NAME));`
`98`	`98`
	`99`	`+ ControllerManagerRunner cm_runner(this);`
`99`	`100`	`EXPECT_EQ(call_spawner("ctrl_1 -c test_controller_manager"), 0);`
`100`	`101`
`101`	`102`	`ASSERT_EQ(cm_->get_loaded_controllers().size(), 1ul);`