Skip to content

Fix Pytest 8/9 compatibility in launch_testing_ros hooks #540

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
ahcorde merged 1 commit into from
May 5, 2026
+11 −2
Merged

Fix Pytest 8/9 compatibility in launch_testing_ros hooks #540

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
13 changes: 11 additions & 2 deletions 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 @@ -20,11 +20,20 @@
import pytest


def pytest_launch_collect_makemodule(path, parent, entrypoint):
def _pytest_version_ge(major, minor=0, patch=0):
"""Return True if pytest version is >= the given version."""
pytest_version = tuple([int(v) for v in pytest.__version__.split('.')])
return pytest_version >= (major, minor, patch)


def pytest_launch_collect_makemodule(module_path, parent, entrypoint):
marks = getattr(entrypoint, 'pytestmark', [])
if marks and any(m.name == 'rostest' for m in marks):
from launch_testing_ros.pytest.hooks import LaunchROSTestModule
module = LaunchROSTestModule.from_parent(parent=parent, fspath=path)
if _pytest_version_ge(7):
module = LaunchROSTestModule.from_parent(parent=parent, path=module_path)
else:
module = LaunchROSTestModule.from_parent(parent=parent, fspath=module_path)
for mark in marks:
decorator = getattr(pytest.mark, mark.name)
decorator = decorator.with_args(*mark.args, **mark.kwargs)
Expand Down