-
Notifications
You must be signed in to change notification settings - Fork 775
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) #4590
Conversation
* Refs #20655. Improve HELPER_WaitForEntries. Signed-off-by: Miguel Company <[email protected]> * Refs #20655. Fix default_macros_test. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit bdef74e) # Conflicts: # test/unittest/logging/log_macros/LogMacrosDefaultTests.cpp
Cherry-pick of bdef74e has failed:
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 would you mind addressing the conflicts here ? |
Friendly ping @MiguelCompany |
Signed-off-by: Miguel Company <[email protected]>
@Mario-DL done |
@richiprosima please test this |
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.
LGTM. Github CI test fails are unrelated. Jenkins green.
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 ofFASTDDS_ENFORCE_LOG_INFO
.This PR fixes the race condition in
HELPER_WaitForEntries
by early returning the collection of log entries, and fixesdefault_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 ofFASTDDS_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
This is an automatic backport of pull request #4582 done by [Mergify](https://mergify.com).