[20655] Fix flakey Log tests (backport #4582) #4589
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
12 tasks
|
@Mergifyio rebase |
* 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)
✅ Branch has been successfully rebased |
MiguelCompany
force-pushed
the
mergify/bp/2.10.x/pr-4582
branch
from
3f2cb0e
to
012c487
Compare
|
@richiprosima Please test this |
MiguelCompany
approved these changes
Mar 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Test
LogMacrosTests.default_macros_testhas 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_WaitForEntriesby early returning the collection of log entries, and fixesdefault_macros_testby 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.mdfile (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).