Skip to content

Remove duplicate test cases in TestAnySubscriptionCallback::is_serialized_message_callback (backport #3104)#3106

Merged
ahcorde merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-3104
Mar 23, 2026
Merged

Remove duplicate test cases in TestAnySubscriptionCallback::is_serialized_message_callback (backport #3104)#3106
ahcorde merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-3104

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 21, 2026

Description

I found some test cases that were implemented twice, so I removed them. So this us just a bit of "cleanup".

Is this user-facing behavior change?

No

Did you use Generative AI?

No

This is an automatic backport of pull request #3104 done by Mergify.

@Zyrin @mergify
remove duplicate test cases in TestAnySubscriptionCallback::is_serial…
64898e1 
…ized_message_callback (#3104)

Signed-off-by: Ubuntu <ubuntu@ubuntu-2404-ros-rolling.lxd>
Co-authored-by: Ubuntu <ubuntu@ubuntu-2404-ros-rolling.lxd>
(cherry picked from commit af78e01)

# Conflicts:
#	rclcpp/test/rclcpp/test_any_subscription_callback.cpp
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 21, 2026

Cherry-pick of af78e01 has failed:

On branch mergify/bp/kilted/pr-3104
Your branch is up to date with 'origin/kilted'.

You are currently cherry-picking commit af78e01.
  (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:   rclcpp/test/rclcpp/test_any_subscription_callback.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 label Mar 21, 2026
@mergify mergify bot mentioned this pull request Mar 21, 2026
Merged
@fujitatomoya
resolve conflicts.
a187d6d 
Signed-off-by: Tomoya.Fujita <Tomoya.Fujita@sony.com>
@fujitatomoya fujitatomoya force-pushed the mergify/bp/kilted/pr-3104 branch from 48d5918 to a187d6d Compare March 21, 2026 04:20
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Mar 21, 2026

Pulls: #3106
Gist: https://gist.githubusercontent.com/fujitatomoya/3c913bbaedb5cf696354e4e90fc7b6e8/raw/6c60c5c621a79b2a667b2e9f11e275305f279a84/ros2.repos
BUILD args: --packages-up-to rclcpp
TEST args: --packages-select rclcpp
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/18589

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde merged commit 376e273 into kilted Mar 23, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahcorde ahcorde ahcorde approved these changes

@fujitatomoya fujitatomoya fujitatomoya approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fujitatomoya @ahcorde @Zyrin