Skip to content

Update some tests to be independent of entity ordering (backport #3592)#3642

Open
mergify[bot] wants to merge 1 commit into
ign-gazebo6from
mergify/bp/ign-gazebo6/pr-3592
Open

Update some tests to be independent of entity ordering (backport #3592)#3642
mergify[bot] wants to merge 1 commit into
ign-gazebo6from
mergify/bp/ign-gazebo6/pr-3592

Conversation

@mergify

@mergify mergify Bot commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

🎉 New feature

Span out of #3447

Summary

Update the most straightforward tests to make them independent of order of entity in Each.
Both tests check that a query contains all the entities that should be present (i.e. a world has all the required models, model all the required links, link all the required collisions / visuals). However, it expects them to be in a specific order that is more of an implementation detail.
This PR, span out of the entt refactor, updates the tests so they still validate that all the entities are present but don't test anymore that they are iterated in a specific order.

Test it

Tested by CI, or run the affected tests manually

Checklist

  • Signed all commits for DCO
  • Added a screen capture or video to the PR description that demonstrates the feature
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • Updated Bazel files (if adding new files). Created an issue otherwise.
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.


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

Update the most straightforward tests to make them independent of order of entity in Each.
Both tests check that a query contains all the entities that should be present (i.e. a world has all the required models, model all the required links, link all the required collisions / visuals). However, it expects them to be in a specific order that is more of an implementation detail.
This PR, span out of the entt refactor, updates the tests so they still validate that all the entities are present but don't test anymore that they are iterated in a specific order.

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>

* Remove potential endless loop in SdfGenerator test

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>

* SimulationRunner entity order independence

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>

---------

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
Co-authored-by: Arjo Chakravarty <arjoc@intrinsic.ai>
(cherry picked from commit 12219ac)

# Conflicts:
#	src/SdfEntityCreator_TEST.cc
#	src/SimulationRunner_TEST.cc
@mergify mergify Bot requested a review from arjo129 as a code owner June 1, 2026 06:20
@mergify

mergify Bot commented Jun 1, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 12219ac has failed:

On branch mergify/bp/ign-gazebo6/pr-3592
Your branch is up to date with 'origin/ign-gazebo6'.

You are currently cherry-picking commit 12219acb.
  (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:   src/SdfGenerator_TEST.cc
	modified:   test/integration/recreate_entities.cc
	modified:   test/integration/velocity_control_system.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/SdfEntityCreator_TEST.cc
	both modified:   src/SimulationRunner_TEST.cc

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Inbox

Development

Successfully merging this pull request may close these issues.

2 participants