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

check for state of the controller node before cleanup (backport #1363) #1379

Merged
merged 3 commits into from
Apr 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

This is an automatic backport of pull request #1363 done by Mergify.
Cherry-pick of 6f57faf has failed:

On branch mergify/bp/iron/pr-1363
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 6f57faf.
  (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:   controller_manager/src/controller_manager.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/test/test_controller_manager_srvs.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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 9, 2024
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.

This might fix the conflicts

controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
saikishor and others added 2 commits March 27, 2024 18:05
(cherry picked from commit 6f57faf)

# Conflicts:
#	controller_manager/test/test_controller_manager_srvs.cpp
Co-authored-by: Sai Kishor Kothakota <[email protected]>
@christophfroehlich
Copy link
Contributor

This might fix the conflicts

unfortunately no :/

@christophfroehlich christophfroehlich marked this pull request as draft March 27, 2024 18:07
destogl
destogl previously approved these changes Mar 27, 2024
@destogl destogl marked this pull request as ready for review March 27, 2024 18:59
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.

We would need to remove this part of the test for it to compile

controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
Co-authored-by: Sai Kishor Kothakota <[email protected]>
Copy link

codecov bot commented Mar 28, 2024

Codecov Report

Attention: Patch coverage is 20.00000% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 75.43%. Comparing base (0c647de) to head (90b0765).

Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #1379      +/-   ##
==========================================
- Coverage   75.52%   75.43%   -0.09%     
==========================================
  Files          42       42              
  Lines        3371     3375       +4     
  Branches     1943     1944       +1     
==========================================
  Hits         2546     2546              
- Misses        442      443       +1     
- Partials      383      386       +3     
Flag Coverage Δ
unittests 75.43% <20.00%> (-0.09%) ⬇️

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

Files Coverage Δ
controller_manager/src/controller_manager.cpp 68.22% <20.00%> (-0.25%) ⬇️

@bmagyar bmagyar merged commit 498808f into iron Apr 9, 2024
12 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-1363 branch April 9, 2024 09:58
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.

4 participants