Skip to content

Commit 3323be3

Browse files
christophfroehlichchristophfroehlich
committed
Revert "Activate assertExitCodes tests"
This reverts commit fe28c67.
1 parent d4afd58 commit 3323be3

15 files changed

+112
-99
lines changed

‎example_1/test/test_rrbot_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9191
check_if_js_published("/joint_states", ["joint1", "joint2"])
9292

9393

94-
@launch_testing.post_shutdown_test()
95-
# These tests are run after the processes in generate_test_description() have shutdown.
96-
class TestDescriptionCraneShutdown(unittest.TestCase):
94+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
95+
# @launch_testing.post_shutdown_test()
96+
# # These tests are run after the processes in generate_test_description() have shutdown.
97+
# class TestDescriptionCraneShutdown(unittest.TestCase):
9798

98-
def test_exit_codes(self, proc_info):
99-
"""Check if the processes exited normally."""
100-
launch_testing.asserts.assertExitCodes(proc_info)
99+
# def test_exit_codes(self, proc_info):
100+
# """Check if the processes exited normally."""
101+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_10/test/test_rrbot_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9696
check_if_js_published("/joint_states", ["joint1", "joint2"])
9797

9898

99-
@launch_testing.post_shutdown_test()
100-
# These tests are run after the processes in generate_test_description() have shutdown.
101-
class TestDescriptionCraneShutdown(unittest.TestCase):
99+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
100+
# @launch_testing.post_shutdown_test()
101+
# # These tests are run after the processes in generate_test_description() have shutdown.
102+
# class TestDescriptionCraneShutdown(unittest.TestCase):
102103

103-
def test_exit_codes(self, proc_info):
104-
"""Check if the processes exited normally."""
105-
launch_testing.asserts.assertExitCodes(proc_info)
104+
# def test_exit_codes(self, proc_info):
105+
# """Check if the processes exited normally."""
106+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_11/test/test_carlikebot_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9797
)
9898

9999

100-
@launch_testing.post_shutdown_test()
101-
# These tests are run after the processes in generate_test_description() have shutdown.
102-
class TestDescriptionCraneShutdown(unittest.TestCase):
100+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
101+
# @launch_testing.post_shutdown_test()
102+
# # These tests are run after the processes in generate_test_description() have shutdown.
103+
# class TestDescriptionCraneShutdown(unittest.TestCase):
103104

104-
def test_exit_codes(self, proc_info):
105-
"""Check if the processes exited normally."""
106-
launch_testing.asserts.assertExitCodes(proc_info)
105+
# def test_exit_codes(self, proc_info):
106+
# """Check if the processes exited normally."""
107+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_12/test/test_rrbot_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
from launch.launch_description_sources import PythonLaunchDescriptionSource
4141
from launch_testing.actions import ReadyToTest
4242

43-
import launch_testing.markers
43+
# import launch_testing.markers
4444
import rclpy
4545
from rclpy.node import Node
4646
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):
141141
check_if_js_published("/joint_states", ["joint1", "joint2"])
142142

143143

144-
@launch_testing.post_shutdown_test()
145-
# These tests are run after the processes in generate_test_description() have shutdown.
146-
class TestDescriptionCraneShutdown(unittest.TestCase):
144+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
145+
# @launch_testing.post_shutdown_test()
146+
# # These tests are run after the processes in generate_test_description() have shutdown.
147+
# class TestDescriptionCraneShutdown(unittest.TestCase):
147148

148-
def test_exit_codes(self, proc_info):
149-
"""Check if the processes exited normally."""
150-
launch_testing.asserts.assertExitCodes(proc_info)
149+
# def test_exit_codes(self, proc_info):
150+
# """Check if the processes exited normally."""
151+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_14/test/test_rrbot_modular_actuators_without_feedback_sensors_for_position_feedback_launch.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def test_check_if_msgs_published(self):
9595

9696

9797
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
98-
# see https://github.com/ros-controls/ros2_control_demos/issues/542
9998
# @launch_testing.post_shutdown_test()
10099
# # These tests are run after the processes in generate_test_description() have shutdown.
101100
# class TestDescriptionCraneShutdown(unittest.TestCase):

‎example_15/test/test_multi_controller_manager_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545

@@ -96,10 +96,11 @@ def test_check_if_msgs_published(self):
9696
check_if_js_published("/rrbot_2/joint_states", ["rrbot_2_joint1", "rrbot_2_joint2"])
9797

9898

99-
@launch_testing.post_shutdown_test()
100-
# These tests are run after the processes in generate_test_description() have shutdown.
101-
class TestDescriptionCraneShutdown(unittest.TestCase):
99+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
100+
# @launch_testing.post_shutdown_test()
101+
# # These tests are run after the processes in generate_test_description() have shutdown.
102+
# class TestDescriptionCraneShutdown(unittest.TestCase):
102103

103-
def test_exit_codes(self, proc_info):
104-
"""Check if the processes exited normally."""
105-
launch_testing.asserts.assertExitCodes(proc_info)
104+
# def test_exit_codes(self, proc_info):
105+
# """Check if the processes exited normally."""
106+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_15/test/test_rrbot_namespace_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545

@@ -95,10 +95,11 @@ def test_check_if_msgs_published(self):
9595
check_if_js_published("/rrbot/joint_states", ["joint1", "joint2"])
9696

9797

98-
@launch_testing.post_shutdown_test()
99-
# These tests are run after the processes in generate_test_description() have shutdown.
100-
class TestDescriptionCraneShutdown(unittest.TestCase):
98+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
99+
# @launch_testing.post_shutdown_test()
100+
# # These tests are run after the processes in generate_test_description() have shutdown.
101+
# class TestDescriptionCraneShutdown(unittest.TestCase):
101102

102-
def test_exit_codes(self, proc_info):
103-
"""Check if the processes exited normally."""
104-
launch_testing.asserts.assertExitCodes(proc_info)
103+
# def test_exit_codes(self, proc_info):
104+
# """Check if the processes exited normally."""
105+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_2/test/test_diffbot_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9191
check_if_js_published("/joint_states", ["left_wheel_joint", "right_wheel_joint"])
9292

9393

94-
@launch_testing.post_shutdown_test()
95-
# These tests are run after the processes in generate_test_description() have shutdown.
96-
class TestDescriptionCraneShutdown(unittest.TestCase):
94+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
95+
# @launch_testing.post_shutdown_test()
96+
# # These tests are run after the processes in generate_test_description() have shutdown.
97+
# class TestDescriptionCraneShutdown(unittest.TestCase):
9798

98-
def test_exit_codes(self, proc_info):
99-
"""Check if the processes exited normally."""
100-
launch_testing.asserts.assertExitCodes(proc_info)
99+
# def test_exit_codes(self, proc_info):
100+
# """Check if the processes exited normally."""
101+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_3/test/test_rrbot_system_multi_interface_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9191
check_if_js_published("/joint_states", ["joint1", "joint2"])
9292

9393

94-
@launch_testing.post_shutdown_test()
95-
# These tests are run after the processes in generate_test_description() have shutdown.
96-
class TestDescriptionCraneShutdown(unittest.TestCase):
94+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
95+
# @launch_testing.post_shutdown_test()
96+
# # These tests are run after the processes in generate_test_description() have shutdown.
97+
# class TestDescriptionCraneShutdown(unittest.TestCase):
9798

98-
def test_exit_codes(self, proc_info):
99-
"""Check if the processes exited normally."""
100-
launch_testing.asserts.assertExitCodes(proc_info)
99+
# def test_exit_codes(self, proc_info):
100+
# """Check if the processes exited normally."""
101+
# launch_testing.asserts.assertExitCodes(proc_info)

‎example_4/test/test_rrbot_system_with_sensor_launch.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from launch.launch_description_sources import PythonLaunchDescriptionSource
4040
from launch_testing.actions import ReadyToTest
4141

42-
import launch_testing.markers
42+
# import launch_testing.markers
4343
import rclpy
4444
from rclpy.node import Node
4545
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):
9191
check_if_js_published("/joint_states", ["joint1", "joint2"])
9292

9393

94-
@launch_testing.post_shutdown_test()
95-
# These tests are run after the processes in generate_test_description() have shutdown.
96-
class TestDescriptionCraneShutdown(unittest.TestCase):
94+
# TODO(anyone): enable this if shutdown of ros2_control_node does not fail anymore
95+
# @launch_testing.post_shutdown_test()
96+
# # These tests are run after the processes in generate_test_description() have shutdown.
97+
# class TestDescriptionCraneShutdown(unittest.TestCase):
9798

98-
def test_exit_codes(self, proc_info):
99-
"""Check if the processes exited normally."""
100-
launch_testing.asserts.assertExitCodes(proc_info)
99+
# def test_exit_codes(self, proc_info):
100+
# """Check if the processes exited normally."""
101+
# launch_testing.asserts.assertExitCodes(proc_info)

0 commit comments

Comments
 (0)