Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 18, 2025

Added some launch arguments and some checks to avoid connecting to the dashboard interface when using mock hardware, as that will not work. Maybe not the most elegant, but it works for now. Currently passthrough controller does not work at all with mock hardware, and is bypassed if using that in the test. test_trajectory_scaled_aborts_on_violation fails, as the hardware doesnt abort. test_set_io also fails as the controller cant verify that a pin has been set.


This is an automatic backport of pull request #1226 done by Mergify.

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Sep 18, 2025
@mergify
Copy link
Author

mergify bot commented Sep 18, 2025

Cherry-pick of fe37d9a has failed:

On branch mergify/bp/humble/pr-1226
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit fe37d9a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   ur_robot_driver/test/integration_test_config_controller.py
	modified:   ur_robot_driver/test/integration_test_controller_switch.py
	modified:   ur_robot_driver/test/integration_test_force_mode.py
	new file:   ur_robot_driver/test/integration_test_io_controller.py
	new file:   ur_robot_driver/test/integration_test_passthrough_controller.py
	new file:   ur_robot_driver/test/integration_test_scaled_joint_controller.py
	modified:   ur_robot_driver/test/integration_test_tool_contact.py
	modified:   ur_robot_driver/test/test_common.py
	new file:   ur_robot_driver/test/test_mock_hardware.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_robot_driver/CMakeLists.txt
	deleted by them: ur_robot_driver/test/robot_driver.py
	deleted by us:   ur_robot_driver/urdf/ur.ros2_control.xacro

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

URJala and others added 2 commits October 10, 2025 11:58
(cherry picked from commit fe37d9a)

# Conflicts:
#	ur_robot_driver/CMakeLists.txt
#	ur_robot_driver/test/robot_driver.py
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1226 branch from 1d7b4f4 to b5bfb54 Compare October 10, 2025 12:28
@urfeex urfeex removed the conflicts label Oct 10, 2025
We don't have that on the humble branch
@urfeex urfeex merged commit 4f1f0a6 into humble Oct 10, 2025
5 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1226 branch October 10, 2025 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants