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

[20655] Fix flakey Log tests (backport #4582) #4588

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2024

Description

Test LogMacrosTests.default_macros_test has been sporadically failing in Github CI, especially on Windows.
Analysis showed it was due to a race condition in HELPER_WaitForEntries, and the test not accounting for the value of FASTDDS_ENFORCE_LOG_INFO.

This PR fixes the race condition in HELPER_WaitForEntries by early returning the collection of log entries, and fixes default_macros_test by always waiting for 3 entries and then checking that the expected number of entries is returned, also taking into consideration the value of FASTDDS_ENFORCE_LOG_INFO.

@Mergifyio backport 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.

  • 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

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

  • 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 #4582 done by [Mergify](https://mergify.com).

* Refs #20655. Improve HELPER_WaitForEntries.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20655. Fix default_macros_test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit bdef74e)
@mergify mergify bot mentioned this pull request Mar 20, 2024
12 tasks
@EduPonz EduPonz added this to the v2.13.4 milestone Mar 20, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Mar 21, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

3 similar comments
@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

Even though Mac CI has not run in Jenkins, the other CI issues are unrelated to this PR.
Considering it 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 Mar 27, 2024
@EduPonz EduPonz merged commit 2492cf2 into 2.13.x Mar 28, 2024
13 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4582 branch March 28, 2024 08:41
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.

3 participants