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

[20652] Improve filtering of DNS tests #4603

Merged
merged 9 commits into from
Mar 26, 2024
Merged

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Mar 22, 2024

Description

When both PKCS#11 and DNS tests had to be disabled, the filter expression for gtest was incorrectly generated.
This made Ubuntu and MacOS CI on github fail.

Additionally, this PR fixes the commands used to detect whether the DNS local entries for the corresponding tests have been added, and adds some related informational messages to the CMake files.

@Mergifyio backport 2.13.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A 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.
  • 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.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v2.14.1 milestone Mar 22, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added the needs-review PR that is ready to be reviewed label Mar 25, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the needs-review PR that is ready to be reviewed label Mar 25, 2024
@MiguelCompany
Copy link
Member Author

@richiprosima Please test this

@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Mar 25, 2024
@EduPonz EduPonz removed the ci-pending PR which CI is running label Mar 26, 2024
@EduPonz
Copy link

EduPonz commented Mar 26, 2024

@Mergifyio backport 2.13.x

@EduPonz EduPonz merged commit 1d9d559 into master Mar 26, 2024
11 of 16 checks passed
@EduPonz EduPonz deleted the hotfix/filter_dns_test branch March 26, 2024 06:49
Copy link
Contributor

mergify bot commented Mar 26, 2024

backport 2.13.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Mar 26, 2024
* Refs #20652. Fix windows command to check local DNS name.

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

* Refs #20652. Correctly combine blackbox filters.

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

* Refs #20652. Informational message on participant test.

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

* Refs #20652. Use correct command on Apple to check local DNS name.

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

* Refs #20652. Use filter on RTPS blackbox tests.

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

* Refs #20652. Fix typo.

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

* Refs #20652. Fix filter in LocatorTests.

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

* Refs #20652. Filter with grep in mac.

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

* Refs #20652. Fix concurrency group in ubuntu-ci.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 1d9d559)
EduPonz pushed a commit that referenced this pull request Mar 28, 2024
* Refs #20652. Fix windows command to check local DNS name.

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

* Refs #20652. Correctly combine blackbox filters.

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

* Refs #20652. Informational message on participant test.

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

* Refs #20652. Use correct command on Apple to check local DNS name.

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

* Refs #20652. Use filter on RTPS blackbox tests.

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

* Refs #20652. Fix typo.

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

* Refs #20652. Fix filter in LocatorTests.

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

* Refs #20652. Filter with grep in mac.

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

* Refs #20652. Fix concurrency group in ubuntu-ci.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 1d9d559)

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants