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

Adapt tests to Zenoh (backport #988) #991

Merged
merged 3 commits into from
Mar 21, 2025
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 20, 2025

Related with ros2/rmw_zenoh#523


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

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 31d814d)

# Conflicts:
#	ros2topic/test/test_bw_delay_hz.py
#	ros2topic/test/test_echo_pub.py
Copy link
Author

mergify bot commented Mar 20, 2025

Cherry-pick of 31d814d has failed:

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

You are currently cherry-picking commit 31d814d.
  (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:   ros2topic/test/test_use_sim_time.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ros2topic/test/test_bw_delay_hz.py
	both modified:   ros2topic/test/test_echo_pub.py

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 20, 2025
@mergify mergify bot mentioned this pull request Mar 20, 2025
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented Mar 20, 2025

Pulls: #991
Gist: https://gist.githubusercontent.com/ahcorde/6e641aa2720fdb8fd7d20900f9e5c2cc/raw/5cdce26a466bea141246cdc41eb41a335b029272/ros2.repos
BUILD args: --packages-up-to ros2topic --packages-above-and-dependencies ros2topic
TEST args: --packages-select ros2topic --packages-above ros2topic
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/15430

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

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented Mar 20, 2025

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

@ahcorde ahcorde merged commit 79ce8e2 into jazzy Mar 21, 2025
2 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-988 branch March 21, 2025 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant