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] Fix for a false negative integration test with bag split in recorder (backport #1743) #1751

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 17, 2024

…1743)

- In
record_end_to_end_with_splitting_bagsize_split_is_at_least_specified_size
publisher was starting after terminating recorder.

Signed-off-by: Michael Orlov <[email protected]>
(cherry picked from commit da1acb2)

# Conflicts:
#	rosbag2_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.cpp
@mergify mergify bot requested a review from a team as a code owner July 17, 2024 17:11
@mergify mergify bot added the conflicts label Jul 17, 2024
@mergify mergify bot removed the request for review from a team July 17, 2024 17:11
Copy link
Author

mergify bot commented Jul 17, 2024

Cherry-pick of da1acb2 has failed:

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

You are currently cherry-picking commit da1acb29.
  (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_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.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 requested review from emersonknapp and james-rms July 17, 2024 17:11
@MichaelOrlov MichaelOrlov changed the title Fix for a false negative integration test with bag split in recorder (backport #1743) [humble] Fix for a false negative integration test with bag split in recorder (backport #1743) Jul 17, 2024
@MichaelOrlov MichaelOrlov marked this pull request as draft July 18, 2024 17:30
Signed-off-by: Michael Orlov <[email protected]>
@MichaelOrlov MichaelOrlov marked this pull request as ready for review July 19, 2024 07:36
@MichaelOrlov
Copy link
Contributor

Pulls: #1751
Gist: https://gist.githubusercontent.com/MichaelOrlov/b9a45439fbbaebd26a8aeb12cece4cf2/raw/a2d35a46e44dae95938452510b12e827b3f5ddaf/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_tests
TEST args: --packages-above rosbag2_tests
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14269

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

@MichaelOrlov MichaelOrlov merged commit 253a703 into humble Jul 19, 2024
14 checks passed
@MichaelOrlov MichaelOrlov deleted the mergify/bp/humble/pr-1743 branch July 19, 2024 15:12
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