Skip to content

cleanup: fix multi-config tests#2202

Merged
BareosBot merged 3 commits intomasterfrom
dev/ssura/master/fix-my-changes
Mar 10, 2025
Merged

cleanup: fix multi-config tests#2202
BareosBot merged 3 commits intomasterfrom
dev/ssura/master/fix-my-changes

Conversation

@sebsura
Copy link
Contributor

@sebsura sebsura commented Mar 10, 2025

Multi-Config tests start multiple sets of daemons (once per config directory). This is not reflected in the cleanup code which only stops the daemons of the "main" config.

We can fix this by simply calling bin/bareos in the cleanup code as this script handles multi-config tests correctly.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
Tests
  • Decision taken that a test is required (if not, then remove this paragraph)
  • The choice of the type of test (unit test or systemtest) is reasonable
  • Testname matches exactly what is being tested
  • On a fail, output of the test leads quickly to the origin of the fault

sebsura added 2 commits March 10, 2025 10:15
We added logic to bin/bareos that automatically calls rscript/bareos
for each defined config directory.  We obviously also need that logic
to shutdown every started daemon, because otherwise only some of them
get shutdown.
This is now done in bin/bareos, so we do not need to do it twice.
@BareosBot BareosBot merged commit 3f02d37 into master Mar 10, 2025
1 check was pending
@BareosBot BareosBot deleted the dev/ssura/master/fix-my-changes branch March 10, 2025 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug This addresses a bug requires backport to 24

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants