Skip to content

[24338] Improve windows tests#6373

Merged
MiguelCompany merged 1 commit into
masterfrom
improve_windows_test
Apr 27, 2026
Merged

[24338] Improve windows tests#6373
MiguelCompany merged 1 commit into
masterfrom
improve_windows_test

Conversation

@cferreiragonz
Copy link
Copy Markdown
Contributor

@cferreiragonz cferreiragonz commented Apr 23, 2026

Description

This PR improves windows tests by making system tests more robust, improving WriterHistory tests teardown and moving the copy of IDL to setup.

@Mergifyio backport 3.4.x 3.2.x 2.14.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.

* Refs #24338: Fix System tests

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

* Refs #24338: Fix IDL tests

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

* Refs #24338: Improve deletion of WriterHistoryTests

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

---------

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added this to the v3.6.2 milestone Apr 23, 2026
@github-actions github-actions Bot added the ci-pending PR which CI is running label Apr 23, 2026
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@cferreiragonz cferreiragonz changed the title Improve windows tests [24338] Improve windows tests Apr 24, 2026
@cferreiragonz cferreiragonz 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 Apr 24, 2026
@MiguelCompany MiguelCompany merged commit e8294c0 into master Apr 27, 2026
25 of 27 checks passed
@MiguelCompany MiguelCompany deleted the improve_windows_test branch April 27, 2026 08:55
@MiguelCompany
Copy link
Copy Markdown
Member

@Mergifyio backport 3.4.x 3.2.x 2.14.x

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Apr 27, 2026

backport 3.4.x 3.2.x 2.14.x

✅ Backports have been created

Details

Cherry-pick of e8294c0 has failed:

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

You are currently cherry-picking commit e8294c00d.
  (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)

Changes to be committed:
	modified:   test/system/tools/fds/CMakeLists.txt
	modified:   test/system/tools/fds/launcher.ps1
	modified:   test/system/tools/fds/tests.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/feature/idl_parser/CMakeLists.txt
	both modified:   test/unittest/rtps/history/WriterHistoryTests.cpp

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

Cherry-pick of e8294c0 has failed:

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

You are currently cherry-picking commit e8294c00d.
  (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)

Changes to be committed:
	modified:   test/system/tools/fds/CMakeLists.txt
	modified:   test/system/tools/fds/launcher.ps1

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/feature/idl_parser/CMakeLists.txt
	both modified:   test/system/tools/fds/tests.py
	both modified:   test/unittest/rtps/history/WriterHistoryTests.cpp

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 pushed a commit that referenced this pull request May 27, 2026
* Refs #24338: Fix System tests

* Refs #24338: Fix IDL tests

* Refs #24338: Improve deletion of WriterHistoryTests

---------


(cherry picked from commit e8294c0)

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
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.

2 participants