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

[20993] Fix ShmTransport buffer recovery MacOS flaky test (backport #4771) #4857

Merged
merged 1 commit into from
May 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2024

Description

This PR tries to fix a MacOS flaky test by refactoring the behavior of the test.

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.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.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

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

* Refs #20993: Refactor flaky test

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #20993: Reduce slow sleep to reduce noise in test

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 2e6b169)
@JesusPoderoso JesusPoderoso added this to the v2.10.5 milestone May 28, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label May 28, 2024
@MiguelCompany MiguelCompany merged commit 7fc31e7 into 2.10.x May 29, 2024
8 of 12 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4771 branch May 29, 2024 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants