Skip to content

Fix launch_testing_ros so it works with pytest 7. #543

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.

Sign up for GitHub

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

Merged
clalancette merged 1 commit into from
May 6, 2026
+6 −6
Merged

Fix launch_testing_ros so it works with pytest 7. #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion launch_testing_ros/launch_testing_ros_pytest_entrypoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# importing downstream modules in upstream packages when built with a merged
# workspace.

import pathlib

import pytest


Expand All @@ -31,7 +33,8 @@ def pytest_launch_collect_makemodule(module_path, parent, entrypoint):
if marks and any(m.name == 'rostest' for m in marks):
from launch_testing_ros.pytest.hooks import LaunchROSTestModule
if _pytest_version_ge(7):
module = LaunchROSTestModule.from_parent(parent=parent, path=module_path)
path = pathlib.Path(module_path)
module = LaunchROSTestModule.from_parent(parent=parent, path=path)
else:
module = LaunchROSTestModule.from_parent(parent=parent, fspath=module_path)
for mark in marks:
Expand Down
7 changes: 2 additions & 5 deletions launch_testing_ros/test/examples/check_msgs_launch_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,8 @@ def subscription_callback(self, data: String):
self.msg_event_object.set()

def spin(self):
try:
while rclpy.ok() and not self.spinning.is_set():
rclpy.spin_once(self.node, timeout_sec=0.1)
finally:
return
while rclpy.ok() and not self.spinning.is_set():
rclpy.spin_once(self.node, timeout_sec=0.1)

def setUp(self):
rclpy.init()
Expand Down