Skip to content

[21233] Mitigate buffer recover test flakiness on mac (backport #5035)#5059

Merged
MiguelCompany merged 1 commit into2.10.xfrom
mergify/bp/2.10.x/pr-5035
Aug 19, 2024
Merged

[21233] Mitigate buffer recover test flakiness on mac (backport #5035)#5059
MiguelCompany merged 1 commit into2.10.xfrom
mergify/bp/2.10.x/pr-5035

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 11, 2024

Description

This PR tries to mitigate the buffer_recover test flakiness in mac, further explanation is included in the comments within the code.

@Mergifyio backport 2.14.x 2.13.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • 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 backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5035 done by [Mergify](https://mergify.com).

@EduPonz EduPonz added this to the v2.10.5 milestone Jul 11, 2024
@MiguelCompany
Copy link
Copy Markdown
Member

@Mergifyio rebase

* Refs #21233: Run mac-ci only and buffer recover test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #21233: Test fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #21233: Apply Elianas sugg

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21233: Apply Miguels sugg

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21233: TMP force multiple test runs

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Revert "Refs #21233: TMP force multiple test runs"

This reverts commit d3e71c9.

* Revert "Refs #21233: Run mac-ci only and buffer recover test"

This reverts commit cbc2aa1.

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit af92c13)
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 31, 2024

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.10.x/pr-5035 branch from 827bff0 to 75c58cd Compare July 31, 2024 08:47
@MiguelCompany MiguelCompany self-requested a review July 31, 2024 08:54
@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 31, 2024
@JesusPoderoso
Copy link
Copy Markdown
Contributor

CI issues unrelated to the backport
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Aug 9, 2024
@MiguelCompany MiguelCompany merged commit 76d39aa into 2.10.x Aug 19, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-5035 branch August 19, 2024 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants