Skip to content
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

Use test_utils from controller_manager package #673

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Use test_utils from controller_manager package #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59983c3
Use test_utils from cm package
christophfroehlich Dec 18, 2024
fed722c
Use add/test_utils branch of ros2_control
christophfroehlich Dec 18, 2024
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
2 changes: 1 addition & 1 deletion example_1/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_1/test/test_rrbot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_1/test/test_rrbot_launch_cli_direct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import check_controllers_running
from controller_manager.test_utils import check_controllers_running


# Executes the given launch file and checks if all nodes can be started
Expand Down
2 changes: 1 addition & 1 deletion example_10/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_10/test/test_rrbot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from launch_testing.actions import ReadyToTest

import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_11/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_11/test/test_carlikebot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_12/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_12/test/test_rrbot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_13/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>ament_cmake_ros</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_ros</test_depend>
<test_depend>launch_testing_ament_cmake</test_depend>
<test_depend>launch_testing</test_depend>
<test_depend>launch</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>rclpy</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_13/test/test_three_robots_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_14/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion ...est/test_rrbot_modular_actuators_without_feedback_sensors_for_position_feedback_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_15/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_15/test/test_multi_controller_manager_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_15/test/test_rrbot_namespace_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_2/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_2/test/test_diffbot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_3/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_3/test/test_rrbot_system_multi_interface_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_4/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_4/test/test_rrbot_system_with_sensor_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_5/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_5/test/test_rrbot_system_with_external_sensor_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_6/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_6/test/test_rrbot_modular_actuators_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_7/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_7/test/test_r6bot_controller_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_8/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_8/test/test_rrbot_transmissions_system_position_only_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
2 changes: 1 addition & 1 deletion example_9/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<exec_depend>xacro</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>launch_testing_ros</test_depend>
<test_depend>liburdfdom-tools</test_depend>
<test_depend>ros2_control_demo_testing</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion example_9/test/test_rrbot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# import launch_testing.markers
import rclpy
from ros2_control_demo_testing.test_utils import (
from controller_manager.test_utils import (
check_controllers_running,
check_if_js_published,
check_node_running,
Expand Down
17 changes: 0 additions & 17 deletions ros2_control_demo_testing/package.xml
View file
Open in desktop

This file was deleted.

Empty file removed ros2_control_demo_testing/resource/ros2_control_demo_testing
View file
Open in desktop
Empty file.
Empty file removed ros2_control_demo_testing/ros2_control_demo_testing/__init__.py
View file
Open in desktop
Empty file.
Loading
Loading