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

controller_manager_srvs tests: Add text to assertions (backport #1023) #1029

Merged
merged 3 commits into from
May 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2023

This is an automatic backport of pull request #1023 done by Mergify.
Cherry-pick of 775dd6a has failed:

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

You are currently cherry-picking commit 775dd6a.
  (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_hardware_management_srvs.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/github/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

This should make debugging failed tests easier.

(cherry picked from commit 775dd6a)

# Conflicts:
#	controller_manager/test/test_hardware_management_srvs.cpp
Copy link
Member

@arne48 arne48 left a comment

Choose a reason for hiding this comment

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

I am not familiar with mergify but for some reason the cherrypick failed and it added the git conflict markers into the file.
line. 94,100,112
Maybe fix it and try again?

bmagyar
bmagyar previously approved these changes May 28, 2023
Copy link
Member

@bmagyar bmagyar left a comment

Choose a reason for hiding this comment

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

I think I fixed the conflict

@bmagyar bmagyar merged commit 37c1caa into humble May 29, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-1023 branch May 29, 2023 09:32
flochre pushed a commit to flochre/ros2_control that referenced this pull request Jul 5, 2023
…ontrols#1023) (ros-controls#1029)

* Add text to assertions references (ros-controls#1023)

This should make debugging failed tests easier.

(cherry picked from commit 775dd6a)

# Conflicts:
#	controller_manager/test/test_hardware_management_srvs.cpp

* plugin_name -> class_type

* plugin_name -> class_type

---------

Co-authored-by: Felix Exner (fexner) <[email protected]>
Co-authored-by: Bence Magyar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants