Skip to content

In Unit Tests use a Salt Minion Server as default system #10435

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

mcalmer
Copy link
Contributor

@mcalmer mcalmer commented Jun 8, 2025

What does this PR change?

In our unit tests we use test functions which create system entries. These system entries are in most cases
traditional systems (aka EnterpriseEntitled).
Uyuni does not support these systems anymore. Today nearly everything is a SaltEntitled MinionServer.

This PR change the default of the test functions to create MinionServer and it adapt the tests to workaround the problems
which show up with this change.

Some tests cannot be changed to MinionServer. In these cases we explicitly create EnterpriseEntitled systems.
Sometimes this is needed as the functionality is not available for MinionServer. Mid term we can try to identify these
functionalities and remove them with the tests.

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed: only internal and user invisible changes

  • DONE

Test coverage

  • Unit tests adapted

  • DONE

Links

Issues(s): https://github.com/SUSE/spacewalk/issues/25085
Port(s): ???

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

Copy link
Contributor

github-actions bot commented Jun 8, 2025

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take some time (aprox. 1h), please be patient ☕

You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/10435/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/10435/checks.

If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code.

Reference tests:

KNOWN ISSUES

Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience.

For more tips on troubleshooting, see the troubleshooting guide.

Happy hacking!
⚠️ You should not merge if acceptance tests fail to pass. ⚠️

@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch 3 times, most recently from 1d3c7d6 to 7d61780 Compare June 15, 2025 12:24
@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch 2 times, most recently from 87ecc80 to 05b081d Compare June 19, 2025 11:31
@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch 3 times, most recently from c0608e7 to 37ac3a5 Compare June 28, 2025 11:55
@mcalmer mcalmer marked this pull request as ready for review June 28, 2025 14:23
@mcalmer mcalmer requested review from a team as code owners June 28, 2025 14:23
@mcalmer mcalmer requested review from nadvornik, mackdk, mbussolotto, CDellaGiusta, lucidd, cbbayburt, cbosdo, wweellddeerr, parlt91 and Serp1co and removed request for a team June 28, 2025 14:23
@mcalmer mcalmer requested a review from aaannz June 28, 2025 14:24
@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch from 37ac3a5 to 296a5fc Compare June 28, 2025 14:30
@mcalmer mcalmer changed the title Join server and minion server In Unit Tests use a Salt Minion Server as default system Jun 28, 2025
@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch from 296a5fc to 9e29add Compare June 28, 2025 14:40
CDellaGiusta
CDellaGiusta previously approved these changes Jun 30, 2025
Copy link
Contributor

@CDellaGiusta CDellaGiusta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -73,7 +74,8 @@ public void setUp() throws Exception {
setRequestPathInfo("/systems/details/Edit");
TestUtils.saveAndFlush(user.getOrg());

s = ServerTestUtils.createTestSystem(user);
// mocking JSP is hard, so let's test with traditional
s = ServerTestUtils.createTestSystem(user, ServerConstants.getServerGroupTypeEnterpriseEntitled());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we have to mock JSP to create a minion?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A Minion is often executing something via taskomatic API which needs to be mocked in a unit test.
Here the Edit Details page has a taskomatic object getting it from the GlobalInstanceHolder and I have no idea how to get a mocked object to it.
Feel free to debug that with a SaltMinion :-)

@mcalmer mcalmer force-pushed the join-Server-and-MinionServer branch from 3d097de to 75c33eb Compare June 30, 2025 15:33
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.

3 participants