Skip to content

[22056] Transform locators using new host_id PID (backport #107)#108

Merged
cferreiragonz merged 2 commits into1.2.xfrom
mergify/bp/1.2.x/pr-107
Dec 20, 2024
Merged

[22056] Transform locators using new host_id PID (backport #107)#108
cferreiragonz merged 2 commits into1.2.xfrom
mergify/bp/1.2.x/pr-107

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Nov 18, 2024

Description

This PR includes a test for a bug in which a TCP client connecting to localhost is unable to identify the locator of a TCP discovery server with a custom GUID listening on any.
Depends on:

@Mergifyio backport 1.2.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The added tests pass locally.
  • Changes are backwards compatible.
  • 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.
This is an automatic backport of pull request #107 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Nov 18, 2024
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Nov 18, 2024

Cherry-pick of 5777caa has failed:

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

You are currently cherry-picking commit 5777caa.
  (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:
	new file:   test/configuration/test_cases/test_94_tcpv4_custom_guid_transform_locators.xml
	new file:   test/configuration/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot
	modified:   test/configuration/tests_params.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/CMakeLists.txt
	both modified:   test/configuration/test_cases/test_95_tcpv4_cli.xml
	both modified:   test/configuration/test_cases/test_96_tcpv6_cli.xml
	both modified:   test/configuration/test_cases/test_97_tcpv4_env_var.xml
	both modified:   test/configuration/test_cases/test_98_tcpv6_env_var.xml

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 mentioned this pull request Nov 18, 2024
Merged
9 tasks
@cferreiragonz cferreiragonz mentioned this pull request Nov 18, 2024
Merged
12 tasks
@cferreiragonz
Bp #107: TCP tests
c2cfb0f 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz force-pushed the mergify/bp/1.2.x/pr-107 branch from b4e7132 to c2cfb0f Compare November 18, 2024 11:27
@cferreiragonz cferreiragonz added ci-pending needs-review PR that is ready to be reviewed and removed conflicts labels Nov 18, 2024
@MiguelCompany MiguelCompany self-requested a review November 28, 2024 08:34
This was referenced Nov 28, 2024
Merged
Merged
Merged
@cferreiragonz
Fix TCP tests in 1.2.x
040fc18 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz requested review from richiprosima and removed request for richiprosima December 18, 2024 11:44
@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed labels Dec 20, 2024
@cferreiragonz cferreiragonz merged commit 67785d5 into 1.2.x Dec 20, 2024
@cferreiragonz cferreiragonz deleted the mergify/bp/1.2.x/pr-107 branch December 20, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees

No one assigned

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MiguelCompany @cferreiragonz