Skip to content

remove patch_and_return to right before where it is necessary.#3042

Merged
jmachowinski merged 1 commit intorollingfrom
fujitatomoya/issues/2926
Jan 29, 2026
Merged

remove patch_and_return to right before where it is necessary.#3042
jmachowinski merged 1 commit intorollingfrom
fujitatomoya/issues/2926

Conversation

@fujitatomoya
Copy link
Copy Markdown
Collaborator

Description

Possible fix for #2926.
I cannot verify this PR to see if it fixes the issue, because i do not have reproducible environment.

Fixes # (issue)

Is this user-facing behavior change?

No

Did you use Generative AI?

No

Additional Information

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes a flaky test by moving the mock setup to the correct location. The test TestExecutor.spin_all_fail_wait_set_clear was failing intermittently because the mock for rcl_wait_set_clear was installed too early, potentially interfering with the first spin_all call depending on whether the wait set needed resizing.

Changes:

  • Moved the patch_and_return call for rcl_wait_set_clear from before the first spin_all to between the first and second spin_all calls, ensuring the mock only affects the intended second call.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

Pulls: #3042
Gist: https://gist.githubusercontent.com/fujitatomoya/4f50dc9e1fdcd63fe26e7521b933ccef/raw/286f9dd90203b301c75e3f05daefe4ec59ac415a/ros2.repos
BUILD args: --packages-up-to rclcpp
TEST args: --packages-select rclcpp
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/18064

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

@jmachowinski jmachowinski merged commit 5ac7f1f into rolling Jan 29, 2026
2 of 3 checks passed
@fujitatomoya
Copy link
Copy Markdown
Collaborator Author

@Mergifyio backport kilted

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jan 29, 2026

backport kilted

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Jan 29, 2026
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
(cherry picked from commit 5ac7f1f)
ahcorde pushed a commit that referenced this pull request Feb 2, 2026
(cherry picked from commit 5ac7f1f)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants