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

[humble] Rewrite TimeControllerClockTest.unpaused_sleep_returns_true to be correct (backport #1384) #1390

Merged
merged 3 commits into from
Jun 12, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 12, 2023

This is an automatic backport of pull request #1384 done by Mergify.
Cherry-pick of 38e9c96 has failed:

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

You are currently cherry-picking commit 38e9c96.
  (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:   rosbag2_cpp/test/rosbag2_cpp/test_time_controller_clock.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

…rect (#1384)

Previous fix attempt's loop over spurious wakeups was never entered.

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit 38e9c96)

# Conflicts:
#	rosbag2_cpp/test/rosbag2_cpp/test_time_controller_clock.cpp
@mergify mergify bot requested a review from a team as a code owner June 12, 2023 17:54
@mergify mergify bot requested review from gbiggs and hidmic and removed request for a team June 12, 2023 17:54
@mergify mergify bot added the conflicts label Jun 12, 2023
Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp
Copy link
Collaborator

emersonknapp commented Jun 12, 2023

backports fix for #1282

@emersonknapp emersonknapp changed the title Rewrite TimeControllerClockTest.unpaused_sleep_returns_true to be correct (backport #1384) [humble] Rewrite TimeControllerClockTest.unpaused_sleep_returns_true to be correct (backport #1384) Jun 12, 2023
@emersonknapp
Copy link
Collaborator

Build is broken because no TimeControllerClock::ros_to_steady method. Either need to backport the method or rewrite the test a little for Humble.

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
@emersonknapp
Copy link
Collaborator

Backported ros_to_steady as a non-virtual method to make the test work. This is an ABI-stable change (virtual would not be)

@emersonknapp emersonknapp self-assigned this Jun 12, 2023
@emersonknapp
Copy link
Collaborator

Pulls: #1390
Gist: https://gist.githubusercontent.com/emersonknapp/993918a4ca416235bb9e912a335caa1e/raw/29f77d4946e829998f219b140721a18e7d8acaef/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp
TEST args: --packages-above rosbag2_cpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12210

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

@emersonknapp emersonknapp merged commit 7351423 into humble Jun 12, 2023
13 of 14 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1384 branch June 12, 2023 21:16
@MichaelOrlov MichaelOrlov added humble Humble Hawksbill and removed conflicts labels Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Humble Hawksbill
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants