Skip to content

Conversation

@caio-freitas
Copy link

@caio-freitas caio-freitas commented Nov 18, 2025

Fix #713

  • Uncommented test case with "bad_robot" as robot description from test suite in test_admittance_controller.cpp.
  • Updated the on_init on test_admittance_controller.hpp to only override the robot description with the one defined in the ros2_control_test_assets if not already defined.
  • On the initialization of the admittance controller, verified if the robot description is a valid xml, similar to what's done in ros2_control/hardware_interface/src/component_parser.cpp (here)

Copy link
Member

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking this. I have some doubts if this is tested properly, see the comments

@christophfroehlich
Copy link
Member

Thinking again, is there really a need to check this inside the controller? The controller manager will not start with a broken urdf, right @saikishor ?

Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @christophfroehlich that this is not needed as CM provides a valid one.

Can you explain to us, why did you have a need to do this?

@christophfroehlich
Copy link
Member

see the linked issue, but this was before we passed the robot description from the cm to the controllers. sorry for not checking that earlier. @caio-freitas would you mind in reverting this and cleanup the tests as by my comments instead?

Copy link
Member

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the failing pre-commit tests: install it locally with pre-commit install, and run pre-commit run --all now to fix.

@codecov
Copy link

codecov bot commented Nov 28, 2025

Codecov Report

❌ Patch coverage is 57.14286% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 84.88%. Comparing base (36cfca8) to head (d4e6235).

Files with missing lines Patch % Lines
...dmittance_controller/src/admittance_controller.cpp 44.44% 4 Missing and 1 partial ⚠️
...nce_controller/test/test_admittance_controller.hpp 80.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2009      +/-   ##
==========================================
- Coverage   84.91%   84.88%   -0.03%     
==========================================
  Files         148      148              
  Lines       14367    14379      +12     
  Branches     1230     1233       +3     
==========================================
+ Hits        12200    12206       +6     
- Misses       1740     1744       +4     
- Partials      427      429       +2     
Flag Coverage Δ
unittests 84.88% <57.14%> (-0.03%) ⬇️

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

Files with missing lines Coverage Δ
...nce_controller/test/test_admittance_controller.cpp 100.00% <ø> (ø)
...nce_controller/test/test_admittance_controller.hpp 94.65% <80.00%> (-0.46%) ⬇️
...dmittance_controller/src/admittance_controller.cpp 73.61% <44.44%> (-0.95%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Member

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the compatibility build fails, please review

Copy link
Member

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, now LGTM!

@christophfroehlich christophfroehlich added backport-humble Triggers PR backport to ROS 2 humble. backport-jazzy Triggers PR backport to ROS 2 jazzy. labels Dec 3, 2025
@christophfroehlich christophfroehlich added the backport-kilted Triggers PR backport to ROS 2 kilted. label Dec 3, 2025
@christophfroehlich christophfroehlich changed the title Check robot description validity on AdmittanceController and test for it Check robot description validity in AdmittanceController Dec 3, 2025
@christophfroehlich christophfroehlich enabled auto-merge (squash) December 3, 2025 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-humble Triggers PR backport to ROS 2 humble. backport-jazzy Triggers PR backport to ROS 2 jazzy. backport-kilted Triggers PR backport to ROS 2 kilted.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

admittance_controller should fail with invalid robot_description

4 participants