Revert "Activate assertExitCodes tests"

This reverts commit fe28c67.
ros-controls · Jul 26, 2024 · 3323be3 · 3323be3
1 parent d4afd58
commit 3323be3
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 99 deletions.
diff --git a/example_1/test/test_rrbot_launch.py b/example_1/test/test_rrbot_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_10/test/test_rrbot_launch.py b/example_10/test/test_rrbot_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -96,10 +96,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_11/test/test_carlikebot_launch.py b/example_11/test/test_carlikebot_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -97,10 +97,11 @@ def test_check_if_msgs_published(self):
         )
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_12/test/test_rrbot_launch.py b/example_12/test/test_rrbot_launch.py
@@ -40,7 +40,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -141,10 +141,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/...est/test_rrbot_modular_actuators_without_feedback_sensors_for_position_feedback_launch.py b/...est/test_rrbot_modular_actuators_without_feedback_sensors_for_position_feedback_launch.py
@@ -95,7 +95,6 @@ def test_check_if_msgs_published(self):
 
 
 # TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
-# see https://github.com/ros-controls/ros2_control_demos/issues/542
 # @launch_testing.post_shutdown_test()
 # # These tests are run after the processes in generate_test_description() have shutdown.
 # class TestDescriptionCraneShutdown(unittest.TestCase):

diff --git a/example_15/test/test_multi_controller_manager_launch.py b/example_15/test/test_multi_controller_manager_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 
@@ -96,10 +96,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/rrbot_2/joint_states", ["rrbot_2_joint1", "rrbot_2_joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_15/test/test_rrbot_namespace_launch.py b/example_15/test/test_rrbot_namespace_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 
@@ -95,10 +95,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/rrbot/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_2/test/test_diffbot_launch.py b/example_2/test/test_diffbot_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["left_wheel_joint", "right_wheel_joint"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_3/test/test_rrbot_system_multi_interface_launch.py b/example_3/test/test_rrbot_system_multi_interface_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_4/test/test_rrbot_system_with_sensor_launch.py b/example_4/test/test_rrbot_system_with_sensor_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_5/test/test_rrbot_system_with_external_sensor_launch.py b/example_5/test/test_rrbot_system_with_external_sensor_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_6/test/test_rrbot_modular_actuators_launch.py b/example_6/test/test_rrbot_modular_actuators_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_7/test/test_r6bot_controller_launch.py b/example_7/test/test_r6bot_controller_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -93,10 +93,11 @@ def test_check_if_msgs_published(self):
         )
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_8/test/test_rrbot_transmissions_system_position_only_launch.py b/example_8/test/test_rrbot_transmissions_system_position_only_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)
diff --git a/example_9/test/test_rrbot_launch.py b/example_9/test/test_rrbot_launch.py
@@ -39,7 +39,7 @@
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch_testing.actions import ReadyToTest
 
-import launch_testing.markers
+# import launch_testing.markers
 import rclpy
 from rclpy.node import Node
 from ros2_control_demo_testing.test_utils import check_controllers_running, check_if_js_published
@@ -91,10 +91,11 @@ def test_check_if_msgs_published(self):
         check_if_js_published("/joint_states", ["joint1", "joint2"])
 
 
-@launch_testing.post_shutdown_test()
-# These tests are run after the processes in generate_test_description() have shutdown.
-class TestDescriptionCraneShutdown(unittest.TestCase):
+# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
+# @launch_testing.post_shutdown_test()
+# # These tests are run after the processes in generate_test_description() have shutdown.
+# class TestDescriptionCraneShutdown(unittest.TestCase):
 
-    def test_exit_codes(self, proc_info):
-        """Check if the processes exited normally."""
-        launch_testing.asserts.assertExitCodes(proc_info)
+#     def test_exit_codes(self, proc_info):
+#         """Check if the processes exited normally."""
+#         launch_testing.asserts.assertExitCodes(proc_info)