Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WaitSet issue in tests (backport #1206) #1212

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2024

This PR aims to fix the WaitSet issue with the command subscription in the tests


This is an automatic backport of pull request #1206 done by Mergify.

(cherry picked from commit 2674f6d)

# Conflicts:
#	joint_trajectory_controller/test/test_trajectory_controller.cpp
#	joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@mergify mergify bot added the conflicts label Jul 16, 2024
Copy link
Contributor Author

mergify bot commented Jul 16, 2024

Cherry-pick of 2674f6d has failed:

On branch mergify/bp/iron/pr-1206
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 2674f6d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.cpp
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
	modified:   admittance_controller/test/test_admittance_controller.cpp
	modified:   admittance_controller/test/test_admittance_controller.hpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.cpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.hpp
	modified:   diff_drive_controller/test/test_diff_drive_controller.cpp
	modified:   effort_controllers/test/test_joint_group_effort_controller.cpp
	modified:   effort_controllers/test/test_joint_group_effort_controller.hpp
	modified:   force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp
	modified:   forward_command_controller/test/test_forward_command_controller.cpp
	modified:   forward_command_controller/test/test_forward_command_controller.hpp
	modified:   forward_command_controller/test/test_multi_interface_forward_command_controller.cpp
	modified:   forward_command_controller/test/test_multi_interface_forward_command_controller.hpp
	modified:   imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp
	modified:   joint_state_broadcaster/test/test_joint_state_broadcaster.cpp
	modified:   pid_controller/test/test_pid_controller.cpp
	modified:   pid_controller/test/test_pid_controller.hpp
	modified:   position_controllers/test/test_joint_group_position_controller.cpp
	modified:   position_controllers/test/test_joint_group_position_controller.hpp
	modified:   range_sensor_broadcaster/test/test_range_sensor_broadcaster.cpp
	modified:   steering_controllers_library/test/test_steering_controllers_library.hpp
	modified:   tricycle_controller/test/test_tricycle_controller.cpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.cpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.hpp
	modified:   velocity_controllers/test/test_joint_group_velocity_controller.cpp
	modified:   velocity_controllers/test/test_joint_group_velocity_controller.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp
	both modified:   joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

codecov bot commented Jul 16, 2024

Codecov Report

Attention: Patch coverage is 83.09179% with 35 lines in your changes missing coverage. Please review.

Project coverage is 87.32%. Comparing base (c728db8) to head (862f511).

Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #1212      +/-   ##
==========================================
+ Coverage   86.87%   87.32%   +0.45%     
==========================================
  Files          92       92              
  Lines        8365     8404      +39     
  Branches      696      697       +1     
==========================================
+ Hits         7267     7339      +72     
+ Misses        846      812      -34     
- Partials      252      253       +1     
Flag Coverage Δ
unittests 87.32% <83.09%> (+0.45%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...roller/test/test_ackermann_steering_controller.cpp 100.00% <100.00%> (ø)
...nce_controller/test/test_admittance_controller.cpp 100.00% <100.00%> (ø)
...ntroller/test/test_bicycle_steering_controller.cpp 100.00% <100.00%> (ø)
...ory_controller/test/test_trajectory_controller.cpp 99.74% <100.00%> (ø)
pid_controller/test/test_pid_controller.cpp 100.00% <100.00%> (ø)
...library/test/test_steering_controllers_library.hpp 96.87% <100.00%> (+1.35%) ⬆️
...troller/test/test_tricycle_steering_controller.cpp 100.00% <100.00%> (ø)
...ive_controller/test/test_diff_drive_controller.cpp 93.60% <80.00%> (+0.54%) ⬆️
...ollers/test/test_joint_group_effort_controller.cpp 98.41% <83.33%> (-1.59%) ⬇️
...ontroller/test/test_forward_command_controller.cpp 99.24% <83.33%> (-0.76%) ⬇️
... and 14 more

... and 5 files with indirect coverage changes

@bmagyar bmagyar merged commit c824345 into iron Jul 16, 2024
9 of 11 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-1206 branch July 16, 2024 14:17
@bmagyar bmagyar added backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. and removed conflicts labels Jul 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants