diff --git a/ur_robot_driver/test/integration_test_force_mode.py b/ur_robot_driver/test/integration_test_force_mode.py index 5fd09cec5..c513eb5d4 100644 --- a/ur_robot_driver/test/integration_test_force_mode.py +++ b/ur_robot_driver/test/integration_test_force_mode.py @@ -114,6 +114,10 @@ def init_robot(self): FollowJointTrajectory, ) + self._controller_manager_interface.wait_for_controller("force_mode_controller") + self._controller_manager_interface.wait_for_controller("scaled_joint_trajectory_controller") + self._controller_manager_interface.wait_for_controller("joint_trajectory_controller") + def setUp(self): self._dashboard_interface.start_robot() time.sleep(1) diff --git a/ur_robot_driver/test/integration_test_passthrough_controller.py b/ur_robot_driver/test/integration_test_passthrough_controller.py index edfa3b90e..55001f1f7 100644 --- a/ur_robot_driver/test/integration_test_passthrough_controller.py +++ b/ur_robot_driver/test/integration_test_passthrough_controller.py @@ -107,6 +107,10 @@ def init_robot(self): FollowJointTrajectory, ) + # Wait for all controllers needed below, as controller manager services might fail + # e.g. when attempting to deactivate an unknown controller + self._controller_manager_interface.wait_for_controller("scaled_joint_trajectory_controller") + def setUp(self): self._dashboard_interface.start_robot() time.sleep(1) diff --git a/ur_robot_driver/test/integration_test_scaled_joint_controller.py b/ur_robot_driver/test/integration_test_scaled_joint_controller.py index 809465012..073acac63 100755 --- a/ur_robot_driver/test/integration_test_scaled_joint_controller.py +++ b/ur_robot_driver/test/integration_test_scaled_joint_controller.py @@ -88,6 +88,10 @@ def init_robot(self): FollowJointTrajectory, ) + # Wait for all controllers needed below, as controller manager services might fail + # e.g. when attempting to deactivate an unknown controller + self._controller_manager_interface.wait_for_controller("passthrough_trajectory_controller") + def setUp(self): self._dashboard_interface.start_robot() time.sleep(1)