Skip to content

Commit 0a20c8f

Browse files
authored
[CI] test_force_torque_sensor_broadcaster regularily times out (#1639)
1 parent d0d6890 commit 0a20c8f

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster.cpp

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
7676
{
7777
force_torque_sensor_ = std::make_unique<semantic_components::ForceTorqueSensor>(
7878
semantic_components::ForceTorqueSensor(params_.sensor_name));
79+
80+
// TODO(juliaj): remove the logging after resolving
81+
// https://github.com/ros-controls/ros2_controllers/issues/1574
82+
RCLCPP_INFO(
83+
get_node()->get_logger(), "Initialized force_torque_sensor with sensor name %s",
84+
params_.sensor_name.c_str());
7985
}
8086
else
8187
{
@@ -85,6 +91,14 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
8591
semantic_components::ForceTorqueSensor(
8692
force_names.x, force_names.y, force_names.z, torque_names.x, torque_names.y,
8793
torque_names.z));
94+
95+
// TODO(juliaj): remove the logging after resolving
96+
// https://github.com/ros-controls/ros2_controllers/issues/1574
97+
RCLCPP_INFO(
98+
get_node()->get_logger(),
99+
"Initialized force_torque_sensor with interface names %s, %s, %s, %s, %s, %s",
100+
force_names.x.c_str(), force_names.y.c_str(), force_names.z.c_str(), torque_names.x.c_str(),
101+
torque_names.y.c_str(), torque_names.z.c_str());
88102
}
89103

90104
try
@@ -102,11 +116,19 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_configure(
102116
return controller_interface::CallbackReturn::ERROR;
103117
}
104118

119+
// TODO(juliaj): remove the logging after resolving
120+
// https://github.com/ros-controls/ros2_controllers/issues/1574
121+
RCLCPP_INFO(get_node()->get_logger(), "Locking realtime publisher");
105122
realtime_publisher_->lock();
123+
RCLCPP_INFO(get_node()->get_logger(), "Locked realtime publisher");
124+
106125
realtime_publisher_->msg_.header.frame_id = params_.frame_id;
126+
127+
RCLCPP_INFO(get_node()->get_logger(), "Unlocking realtime publisher");
107128
realtime_publisher_->unlock();
129+
RCLCPP_INFO(get_node()->get_logger(), "Unlocked realtime publisher");
108130

109-
RCLCPP_DEBUG(get_node()->get_logger(), "configure successful");
131+
RCLCPP_INFO(get_node()->get_logger(), "Configure successful");
110132
return controller_interface::CallbackReturn::SUCCESS;
111133
}
112134

force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ void ForceTorqueSensorBroadcasterTest::SetUp()
4848
fts_broadcaster_ = std::make_unique<FriendForceTorqueSensorBroadcaster>();
4949
}
5050

51-
void ForceTorqueSensorBroadcasterTest::TearDown() { fts_broadcaster_.reset(nullptr); }
51+
void ForceTorqueSensorBroadcasterTest::TearDown()
52+
{
53+
// TODO(juliaj): remove the logging after resolving
54+
// https://github.com/ros-controls/ros2_controllers/issues/1574
55+
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "In TearDown");
56+
fts_broadcaster_.reset(nullptr);
57+
}
5258

5359
void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
5460
{
@@ -66,6 +72,9 @@ void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
6672
state_ifs.emplace_back(fts_torque_z_);
6773

6874
fts_broadcaster_->assign_interfaces({}, std::move(state_ifs));
75+
// TODO(juliaj): remove the logging after resolving
76+
// https://github.com/ros-controls/ros2_controllers/issues/1574
77+
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "FTSBroadcaster setup done");
6978
}
7079

7180
void ForceTorqueSensorBroadcasterTest::subscribe_and_get_message(
@@ -180,13 +189,19 @@ TEST_F(ForceTorqueSensorBroadcasterTest, InterfaceNames_Configure_Success)
180189
{
181190
SetUpFTSBroadcaster();
182191

192+
// TODO(juliaj): remove the logging after resolving
193+
// https://github.com/ros-controls/ros2_controllers/issues/1574
194+
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "Setting up interface names");
195+
183196
// set the 'interface_names'
184197
fts_broadcaster_->get_node()->set_parameter({"interface_names.force.x", "fts_sensor/force.x"});
185198
fts_broadcaster_->get_node()->set_parameter({"interface_names.torque.z", "fts_sensor/torque.z"});
186199

200+
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "Setting up frame_id");
187201
// set the 'frame_id'
188202
fts_broadcaster_->get_node()->set_parameter({"frame_id", frame_id_});
189203

204+
RCLCPP_INFO(fts_broadcaster_->get_node()->get_logger(), "Calling on_configure");
190205
// configure passed
191206
ASSERT_EQ(fts_broadcaster_->on_configure(rclcpp_lifecycle::State()), NODE_SUCCESS);
192207
}

0 commit comments

Comments
 (0)