Open mergify[bot] opened 1 month ago
Cherry-pick of 079392b94867c3372c0050492327001057118090 has failed:
On branch mergify/bp/iron/pr-1692
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit 079392b.
(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)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: controller_manager/test/test_spawner_unspawner.cpp
no changes added to commit (use "git add" and/or "git commit -a")
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
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 62.19%. Comparing base (
8e33b4e
) to head (c01c3f7
).
As reported by @christophfroehlich in https://github.com/ros-controls/ros2_control/issues/1685, it seems that spawner tests are inconsistent and timing out after some time. I was able to reproduce it locally and upon checking it seems like the CM's internal mutexes are blcoking as there is no ControllerManagerRunner in some of these tests. Adding these should fix the above timeout issues. I've tested it locally and it seems to work
Fixes #1685
This is an automatic backport of pull request #1692 done by Mergify.