Inherit markers from generate_test_description (ros2#670)

nlamprian · Nov 16, 2022 · 54fdda1 · 54fdda1
1 parent 8869d81
commit 54fdda1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/launch_testing/launch_testing/pytest/hooks.py b/launch_testing/launch_testing/pytest/hooks.py
@@ -216,9 +216,14 @@ def pytest_launch_collect_makemodule(path, parent, entrypoint):
     if marks and any(m.name == 'launch_test' for m in marks):
         if _pytest_version_ge(7):
             path = pathlib.Path(path)
-            return LaunchTestModule.from_parent(parent=parent, path=path)
+            module = LaunchTestModule.from_parent(parent=parent, path=path)
         else:
-            return LaunchTestModule.from_parent(parent=parent, fspath=path)
+            module = LaunchTestModule.from_parent(parent=parent, fspath=path)
+        for mark in marks:
+            decorator = getattr(pytest.mark, mark.name)
+            decorator = decorator.with_args(*mark.args, **mark.kwargs)
+            module.add_marker(decorator)
+        return module
 
 
 def pytest_addhooks(pluginmanager):