Skip to content

[22995] Fix MacOS nightly flaky tests (backport #5738) #5739

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 1, 2025

Description

This PR provides some fixes in a couple of tests failing in the nighties

@Mergifyio backport 3.1.x 2.14.x 2.10.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 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 #5738 done by [Mergify](https://mergify.com).

* Refs #22995: Fix extended monitor service qos BB test

Signed-off-by: Mario Domínguez López <[email protected]>

* Refs #22955: Fix single_unicast_pdp_response_flowcontroller for a single threaded system

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Domínguez López <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 6d0d853)

# Conflicts:
#	test/blackbox/common/BlackboxTestsDiscovery.cpp
#	test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
Copy link
Contributor Author

mergify bot commented Apr 1, 2025

Cherry-pick of 6d0d853 has failed:

On branch mergify/bp/3.1.x/pr-5738
Your branch is up to date with 'origin/3.1.x'.

You are currently cherry-picking commit 6d0d853c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsMonitorService.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 1, 2025
@mergify mergify bot mentioned this pull request Apr 1, 2025
11 tasks
@MiguelCompany MiguelCompany added this to the v3.1.3 milestone Apr 1, 2025
@Mario-DL
Copy link
Member

Flaky tests affects to tests checking non-existing features in 3.1.x (ExtendedIncompatibleQoS for monitor service and Builtin Flow Controllers), closing this backport

@Mario-DL Mario-DL closed this May 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants