Open mergify[bot] opened 1 week ago
Cherry-pick of ab34495d2d901fb9f053b706bb610c574b5bc0d6 has failed:
On branch mergify/bp/iron/pr-3077
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit ab34495d2.
(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: moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_functions.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: moveit_core/robot_state/src/robot_state.cpp
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
@sea-bass Happy to close on Iron EOL?
Description
Fixes #3072
RobotState
cansetFromIK
with a collision objectRobotState
cannotsetFromIK
with a subframeRobotState::setFromIK
to consider subframesI tried adding the tests directly to the robot state tests, however, I was getting issues with no kinematic solver being associated with the planning group of the
OneRobot
fixture.Pilz already had a test which was checking
setFromIK
, and appears to be setup with a kinematic solver, so I've added the tests there.Checklist
This is an automatic backport of pull request #3077 done by Mergify.