diff --git a/example_13/CMakeLists.txt b/example_13/CMakeLists.txt index 06aec8e9..e63aa68a 100644 --- a/example_13/CMakeLists.txt +++ b/example_13/CMakeLists.txt @@ -34,11 +34,18 @@ install( ) if(BUILD_TESTING) + find_package(ament_cmake_ros REQUIRED) + find_package(launch_testing_ament_cmake REQUIRED) find_package(ament_cmake_pytest REQUIRED) ament_add_pytest_test(example_13_urdf_xacro test/test_urdf_xacro.py) ament_add_pytest_test(view_example_13_launch test/test_view_robot_launch.py) - ament_add_pytest_test(run_example_13_launch test/test_three_robots_launch.py) + + function(add_ros_isolated_launch_test path) + set(RUNNER "${ament_cmake_ros_DIR}/run_test_isolated.py") + add_launch_test("${path}" RUNNER "${RUNNER}" ${ARGN}) + endfunction() + add_ros_isolated_launch_test(test/test_three_robots_launch.py) endif() ## EXPORTS diff --git a/example_13/package.xml b/example_13/package.xml index 0cc8f4a5..9e0af6f6 100644 --- a/example_13/package.xml +++ b/example_13/package.xml @@ -31,8 +31,13 @@ xacro ament_cmake_pytest - launch_testing_ros + ament_cmake_ros + launch_ros + launch_testing_ament_cmake + launch_testing + launch liburdfdom-tools + rclpy ros2_control_demo_testing xacro diff --git a/example_13/test/test_three_robots_launch.py b/example_13/test/test_three_robots_launch.py index 9e0fed68..eaaa12ac 100644 --- a/example_13/test/test_three_robots_launch.py +++ b/example_13/test/test_three_robots_launch.py @@ -29,7 +29,6 @@ # Author: Christoph Froehlich import os -import pytest import unittest import subprocess @@ -48,8 +47,7 @@ ) -# Executes the given launch file and checks if all nodes can be started -@pytest.mark.rostest +# Executes the given launch file def generate_test_description(): launch_include = IncludeLaunchDescription( PythonLaunchDescriptionSource(