ros2_control icon indicating copy to clipboard operation
ros2_control copied to clipboard

Handle on waiting

Open bmagyar opened this issue 1 year ago • 2 comments

Conflict resolved from https://github.com/ros-controls/ros2_control/pull/1483

bmagyar avatar Jun 05 '24 17:06 bmagyar

This pull request is in conflict. Could you fix it @bmagyar?

mergify[bot] avatar Jun 25 '24 11:06 mergify[bot]

We tested this PR (adding back in line 228 in controller_manager/controller_manager/spawner.py) and we were able to run ros2_control over a FastDDS discovery server.

wittenator avatar Jun 26 '24 15:06 wittenator

I think I've touched up everything immediately needed. @fmauch , @wittenator could you guys please give me another round of feedback?

bmagyar avatar Jul 15 '24 12:07 bmagyar

This pull request is in conflict. Could you fix it @bmagyar?

mergify[bot] avatar Aug 09 '24 11:08 mergify[bot]

As written in different comments I think this needs some points to be addressed. I've updated thinks on my fork for cherry-picking.

If you create a PR to fix/spawner-interrupt, we could directly merge them in.

christophfroehlich avatar Aug 12 '24 06:08 christophfroehlich

As written in different comments I think this needs some points to be addressed. I've updated thinks on my fork for cherry-picking.

If you create a PR to fix/spawner-interrupt, we could directly merge them in.

Done in #1666

fmauch avatar Aug 12 '24 08:08 fmauch

Note for myself: squash + merge from a PR with merge commits into another PR is not a good idea.

christophfroehlich avatar Aug 12 '24 12:08 christophfroehlich

Codecov Report

Attention: Patch coverage is 2.12766% with 46 lines in your changes missing coverage. Please review.

Project coverage is 84.60%. Comparing base (07fb4f3) to head (921c106). Report is 2 commits behind head on master.

Files Patch % Lines
.../controller_manager/controller_manager_services.py 0.00% 18 Missing :warning:
...ler_manager/controller_manager/hardware_spawner.py 0.00% 13 Missing :warning:
controller_manager/controller_manager/spawner.py 0.00% 9 Missing :warning:
controller_manager/controller_manager/unspawner.py 0.00% 6 Missing :warning:
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1562   +/-   ##
=======================================
  Coverage   84.59%   84.60%           
=======================================
  Files         115      115           
  Lines       10537    10459   -78     
  Branches      972      965    -7     
=======================================
- Hits         8914     8849   -65     
+ Misses       1295     1284   -11     
+ Partials      328      326    -2     
Flag Coverage Δ
unittests 84.60% <2.12%> (+<0.01%) :arrow_up:

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

Files Coverage Δ
controller_manager/test/test_spawner_unspawner.cpp 100.00% <100.00%> (+1.01%) :arrow_up:
controller_manager/controller_manager/unspawner.py 0.00% <0.00%> (ø)
controller_manager/controller_manager/spawner.py 0.00% <0.00%> (ø)
...ler_manager/controller_manager/hardware_spawner.py 0.00% <0.00%> (ø)
.../controller_manager/controller_manager_services.py 0.00% <0.00%> (ø)

codecov[bot] avatar Aug 12 '24 12:08 codecov[bot]