diff --git a/ros_ws/src/roboprobe_ros/roboprobe_ros/perception_degrader.py b/ros_ws/src/roboprobe_ros/roboprobe_ros/perception_degrader.py index ced3f19..409a10f 100644 --- a/ros_ws/src/roboprobe_ros/roboprobe_ros/perception_degrader.py +++ b/ros_ws/src/roboprobe_ros/roboprobe_ros/perception_degrader.py @@ -8,6 +8,7 @@ import numpy as np import rclpy +from rclpy.executors import ExternalShutdownException from sensor_msgs.msg import PointCloud2 from sensor_msgs_py import point_cloud2 @@ -15,8 +16,6 @@ from roboprobe_ros.base import RoboProbeNode if TYPE_CHECKING: - from collections.abc import Sequence - from rclpy.context import Context from rclpy.parameter import Parameter @@ -89,11 +88,16 @@ def _process_cloud(self, cloud: PointCloud2) -> None: ) -def main(args: Sequence[str] | None = None) -> None: +def main(args: list[str] | None = None) -> None: """Run the perception relay until ROS shuts down.""" - with rclpy.init(args=args): + rclpy.init(args=args) + try: node = PerceptionDegrader() try: rclpy.spin(node) finally: node.destroy_node() + except (KeyboardInterrupt, ExternalShutdownException): + pass + finally: + rclpy.try_shutdown() diff --git a/ros_ws/src/roboprobe_ros/test/test_perception_degrader.py b/ros_ws/src/roboprobe_ros/test/test_perception_degrader.py index 4178c30..4e49dd4 100644 --- a/ros_ws/src/roboprobe_ros/test/test_perception_degrader.py +++ b/ros_ws/src/roboprobe_ros/test/test_perception_degrader.py @@ -19,7 +19,7 @@ from rclpy.parameter import Parameter from rclpy.qos import QoSProfile, QoSReliabilityPolicy from roboprobe_ros._vendor.perturbation.perception import PerceptionModel -from roboprobe_ros.perception_degrader import PerceptionDegrader +from roboprobe_ros.perception_degrader import PerceptionDegrader, main from sensor_msgs.msg import PointCloud2 from sensor_msgs_py import point_cloud2 from std_msgs.msg import Header @@ -144,3 +144,25 @@ def test_rejects_invalid_episode_setup(ros_context: Context, tmp_path: Path) -> PerceptionDegrader( context=ros_context, parameter_overrides=_write_parameters(tmp_path, 50.0, _INPUT) ) + + +def test_console_entry_starts_and_shuts_down( + tmp_path: Path, monkeypatch: pytest.MonkeyPatch +) -> None: + """Use the pinned Jazzy startup API through the installed console entry.""" + overrides = _write_parameters(tmp_path, 50.0) + args = ["--ros-args"] + for override in overrides: + args.extend(["-p", f"{override.name}:={override.value}"]) + + spun: list[str] = [] + + def spin(node: PerceptionDegrader) -> None: + assert rclpy.ok() + spun.append(node.get_name()) + raise KeyboardInterrupt + + monkeypatch.setattr(rclpy, "spin", spin) + main(args) + assert spun == ["perception_degrader"] + assert not rclpy.ok()