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

Add CM switch_controller service timeout as parameter to spawner.py (backport #1790) #1879

Merged
merged 3 commits into from
Nov 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2024

This is a workaround for ros-controls/gz_ros2_control#421 and ros-controls/gazebo_ros2_control#380

If the simulation is started in paused mode, one can now configure also the timeout for the switch_controller service to be completed (the simulation has to be unpaused to perform the controller switches).

Also fixes docs after changes to the spawners in #1562


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

…#1790)

Co-authored-by: Felix Exner (fexner) <[email protected]>
Co-authored-by: Sai Kishor Kothakota <[email protected]>
(cherry picked from commit 23bd1c3)

# Conflicts:
#	controller_manager/doc/userdoc.rst
#	doc/release_notes.rst

This comment was marked as outdated.

@mergify mergify bot added the conflicts label Nov 18, 2024
Copy link

codecov bot commented Nov 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.18%. Comparing base (d897740) to head (7e3ed11).
Report is 16 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1879      +/-   ##
==========================================
+ Coverage   62.58%   63.18%   +0.60%     
==========================================
  Files         108      109       +1     
  Lines       12026    12290     +264     
  Branches     8133     8314     +181     
==========================================
+ Hits         7526     7766     +240     
+ Misses        880      820      -60     
- Partials     3620     3704      +84     
Flag Coverage Δ
unittests 63.18% <100.00%> (+0.60%) ⬆️

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

Files with missing lines Coverage Δ
controller_manager/controller_manager/spawner.py 68.93% <100.00%> (-0.11%) ⬇️
controller_manager/controller_manager/unspawner.py 69.23% <100.00%> (+1.66%) ⬆️

... and 3 files with indirect coverage changes

---- 🚨 Try these New Features:

Copy link
Contributor

@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.

Failing tests due to missing release of ros2_control or #1367

@christophfroehlich christophfroehlich merged commit 80a6eec into humble Nov 18, 2024
7 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1790 branch November 18, 2024 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants