Skip to content

[20121] Remove unnecessary TCP warning & Fix some tests (backport #4217)#4275

Merged
EduPonz merged 3 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4217
Feb 29, 2024
Merged

[20121] Remove unnecessary TCP warning & Fix some tests (backport #4217)#4275
EduPonz merged 3 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4217

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 22, 2024

This is an automatic backport of pull request #4217 done by Mergify.
Cherry-pick of ab94226 has failed:

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

You are currently cherry-picking commit ab9422616.
  (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:   src/cpp/rtps/transport/TCPTransportInterface.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 22, 2024
@mergify mergify bot mentioned this pull request Jan 22, 2024
Merged
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Jan 22, 2024
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4217 branch from ead7e94 to a37133e Compare January 22, 2024 14:54
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 22, 2024
@JesusPoderoso
Copy link
Copy Markdown
Contributor

JesusPoderoso commented Jan 30, 2024

@richiprosima please test linux please test mac

@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 20, 2024

@richiprosima please test linux test mac

@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 23, 2024

@jepemi same also here
Thanks !

@jepemi
Remove unnecessary warning (#4217)
796d5a6 
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit ab94226)
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4217 branch from a37133e to 796d5a6 Compare February 23, 2024 12:05
@jepemi jepemi mentioned this pull request Feb 23, 2024
Merged
@Mario-DL
Refs #20485: Fix tests using PubSubParticipant
d7caded 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Refs #20485: PubSubBasic test fix
640de79 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 26, 2024

I am going ahead and take advantage of this PR to include a couple of commits that fix some of the failing tests of the 2.6.x branch.

@Mario-DL Mario-DL changed the title [20121] Remove unnecessary TCP warning (backport #4217) [20121] Remove unnecessary TCP warning & Fix some tests (backport #4217) Feb 26, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 26, 2024

@richiprosima please test linux test discovery_server

@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 28, 2024

Failing tests on Windows v141 are not related and different tests fail in different runs. Thread sanitizer has no deadlocks but is stuck in the post setup ccache step and it reports fail due to that.
Marking the PR as ready to merge

@Mario-DL Mario-DL 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 Feb 28, 2024
Mario-DL
Mario-DL approved these changes Feb 29, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM

@EduPonz EduPonz merged commit 464de2d into 2.6.x Feb 29, 2024
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4217 branch February 29, 2024 09:59
This was referenced Mar 1, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Mario-DL Mario-DL Mario-DL approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

v2.6.8

Development

Successfully merging this pull request may close these issues.

4 participants

@JesusPoderoso @Mario-DL @EduPonz @jepemi