-
Notifications
You must be signed in to change notification settings - Fork 310
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
Conversation
This should make debugging failed tests easier. (cherry picked from commit 775dd6a) # Conflicts: # controller_manager/test/test_hardware_management_srvs.cpp
There was a problem hiding this 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?
There was a problem hiding this 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
…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]>
This is an automatic backport of pull request #1023 done by Mergify.
Cherry-pick of 775dd6a has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com