Skip to content

Adding aggregator tests again (backport #467)#552

Merged
ct2034 merged 2 commits intoros2-humblefrom
mergify/bp/ros2-humble/pr-467
Mar 30, 2026
Merged

Adding aggregator tests again (backport #467)#552
ct2034 merged 2 commits intoros2-humblefrom
mergify/bp/ros2-humble/pr-467

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 30, 2026


This is an automatic backport of pull request #467 done by [Mergify](https://mergify.com).

* Uncommenting the tests
* Kilted is a thing now
* Reorganizations
---------
Signed-off-by: Christian Henkel <[email protected]>

(cherry picked from commit fa226a4)

# Conflicts:
#	diagnostic_aggregator/CMakeLists.txt
#	diagnostic_common_diagnostics/CMakeLists.txt
@mergify mergify bot added automerge PRs with this label will be merged if all checks are green conflicts labels Mar 30, 2026
@mergify mergify bot assigned ct2034 Mar 30, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 30, 2026

Cherry-pick of fa226a4 has failed:

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

You are currently cherry-picking commit fa226a4.
  (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:
	renamed:    diagnostic_aggregator/test/add_analyzers.launch.py.in -> diagnostic_aggregator/test/test_add_analyzers.launch.py.in
	modified:   diagnostic_aggregator/test/test_analyzers_output.launch.py.in
	renamed:    diagnostic_aggregator/test/create_analyzers.launch.py.in -> diagnostic_aggregator/test/test_create_analyzers.launch.py.in
	modified:   diagnostic_common_diagnostics/test/systemtest/test_hd_monitor_launchtest.py
	modified:   diagnostic_remote_logging/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   diagnostic_aggregator/CMakeLists.txt
	both modified:   diagnostic_common_diagnostics/CMakeLists.txt

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

Signed-off-by: Christian Henkel <[email protected]>
@ct2034 ct2034 merged commit dbe5c33 into ros2-humble Mar 30, 2026
11 of 13 checks passed
@ct2034 ct2034 deleted the mergify/bp/ros2-humble/pr-467 branch March 30, 2026 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge PRs with this label will be merged if all checks are green conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant