[3006.x] Ensure on rpm and deb systems, that user and group for existing Salt, is maintained on upgrade #66218
+993
−232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmurphy18
changed the title
dmurphy18
changed the title
twangboy
requested changes
Jun 27, 2024
| pytestmark = [ | ||
| pytest.mark.skip_unless_on_linux, | ||
| ] | ||
|
|
There was a problem hiding this comment.
Some of these tests should run on Windows and MacOS. The local ones should still run. Maybe skip just the ones that require a master.
| @@ -5,20 +5,24 @@ | |||
| ] | |||
There was a problem hiding this comment.
Skip these on MacOS as well
| ret = salt_call_cli.run("--local", "cmd.run", test_cmd) | ||
| assert ret.returncode == 0 | ||
|
|
||
|
|
||
| @pytest.mark.skip_on_windows |
There was a problem hiding this comment.
Skip for MacOS also, as there is no SystemD
| def test_salt_version(version, install_salt): | ||
| """ | ||
| Test version output from salt --version | ||
| """ | ||
| actual = [] | ||
| test_bin = os.path.join(*install_salt.binary_paths["salt"]) |
There was a problem hiding this comment.
Maybe we should use salt-call here... then it will work on All OSes. No reason why we can't test this on Windows and MacOS. It's one of the few cross-platform tests we could run.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
On upgrading on Redhat and Debian families, ensures that existing permissions (user, group) are preserved.
What issues does this PR fix or reference?
Fixes: #65264
Previous Behavior
Upgrades would force Salt directories etc. permissions user:group to salt:salt
New Behavior
Upgrades of Salt, now note the permissions (user:group) of Salt directories and preserves those permissions.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.