Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use files from demos for testing (backport #485) #488

Draft
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2025

Use the demos directly instead of having different launch description, URDF, and executables for testing. (I just copied the content of the test_position executable to the example_position file in the demos).

I also added separate tests for the clock topic (sim_time), and if the expected controllers are loaded.

velocity and effort tests currently don't really test the system, because no feedback is processed. I'll do that in a new PR because it will change the demos itself.


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

(cherry picked from commit a12ef5a)

# Conflicts:
#	gz_ros2_control_tests/config/cart_controller_position.yaml
#	gz_ros2_control_tests/package.xml
#	gz_ros2_control_tests/tests/position_test.py
#	gz_ros2_control_tests/urdf/test_cart_position.xacro.urdf
#	ign_ros2_control_demos/launch/diff_drive_example_namespaced.launch.py
#	ign_ros2_control_demos/urdf/test_cart_position.xacro.urdf
@mergify mergify bot requested a review from ahcorde as a code owner January 27, 2025 08:27
@mergify mergify bot added the conflicts label Jan 27, 2025
Copy link
Contributor Author

mergify bot commented Jan 27, 2025

Cherry-pick of a12ef5a has failed:

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

You are currently cherry-picking commit a12ef5a.
  (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:
	modified:   gz_ros2_control_tests/CMakeLists.txt
	deleted:    gz_ros2_control_tests/src/test_position.cpp
	modified:   gz_ros2_control_tests/tests/CMakeLists.txt
	new file:   gz_ros2_control_tests/tests/effort_test.py
	new file:   gz_ros2_control_tests/tests/velocity_test.py
	modified:   ign_ros2_control_demos/examples/example_position.cpp
	modified:   ign_ros2_control_demos/launch/ackermann_drive_example.launch.py
	modified:   ign_ros2_control_demos/launch/pendulum_example_effort.launch.py
	modified:   ign_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: gz_ros2_control_tests/config/cart_controller_position.yaml
	both modified:   gz_ros2_control_tests/package.xml
	both modified:   gz_ros2_control_tests/tests/position_test.py
	deleted by them: gz_ros2_control_tests/urdf/test_cart_position.xacro.urdf
	both modified:   ign_ros2_control_demos/launch/diff_drive_example_namespaced.launch.py
	both modified:   ign_ros2_control_demos/urdf/test_cart_position.xacro.urdf

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

@christophfroehlich christophfroehlich self-assigned this Jan 27, 2025
@christophfroehlich christophfroehlich marked this pull request as draft January 27, 2025 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant