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

[20706] Bugfix in DDSBlackboxTestsDataReader test (backport #4720) #4721

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2024

Description

This PR forwards a test fix from #4708 regarding the StackAllocatedSequence.

Note, I checked with master and OK, but the reviewer is encouraged to ask manually for a specific ci despite I added the skip-ci. I am leaving the label though for now.

@Mergifyio backport 2.13.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are ABI compatible.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A Check CI results: changes do not issue any warning.
  • N/A Check CI results: failing tests are unrelated with the changes.
    • Affected test was run locally in Windows and Ubuntu.

This is an automatic backport of pull request #4720 done by [Mergify](https://mergify.com).

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 48aa538)

# Conflicts:
#	test/blackbox/common/DDSBlackboxTestsDataReader.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 24, 2024
Copy link
Contributor Author

mergify bot commented Apr 24, 2024

Cherry-pick of 48aa538 has failed:

On branch mergify/bp/2.13.x/pr-4720
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit 48aa53887.
  (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:   test/blackbox/common/DDSBlackboxTestsDataReader.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@MiguelCompany
Copy link
Member

@Mario-DL I think we should close this, and include it as part of #4706

@Mario-DL
Copy link
Member

Of course, thought I was already merged.
Closing

@Mario-DL Mario-DL closed this Apr 24, 2024
@mergify mergify bot deleted the mergify/bp/2.13.x/pr-4720 branch April 24, 2024 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants