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) #1211

Merged
merged 3 commits into from
Jul 17, 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/humble/pr-1206
Your branch is up to date with 'origin/humble'.

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

@bmagyar bmagyar closed this Jul 16, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-1206 branch July 16, 2024 14:18
@bmagyar bmagyar restored the mergify/bp/humble/pr-1206 branch July 16, 2024 14:39
@bmagyar bmagyar reopened this Jul 16, 2024
@bmagyar bmagyar merged commit c280c07 into humble Jul 17, 2024
7 of 10 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-1206 branch July 17, 2024 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants