[2019.2] Merge forward from 2019.2.1 to 2019.2 #52695
Merged
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
(cherry picked from commit 29a44ac)
Since "pchanges" was never supported in the state compiler, and "changes" is what these reqs always used, replacing "pchanges" with "changes" will allow those requisites to work in test mode. Conflicts: - salt/states/file.py - salt/states/linux_acl.py - salt/utils/napalm.py - tests/integration/modules/test_state.py - tests/unit/states/test_file.py
This allows for a state return dict to be repacked so that the top level keys are the IDs, making it much easier to analyze and craft asserts against the results.
this requisite passes a __prerequired__ kwarg so these need to support **kwargs for that reason. This also changes the comment for salt.function in test mode because it's inaccurate and doesn't make sense. Conflicts: - salt/states/test.py
Conflicts: - tests/unit/states/test_file.py
Conflicts: - tests/unit/states/test_file.py
Conflicts: - salt/modules/win_file.py - salt/states/file.py
Conflicts: - salt/states/file.py
[2019.2.1] Update test_schema to mirror the new ValidationErrors in 3.0.0
Virt purge fix
Bring 51661 into 2019.2.1
[2019.2.1] Update integration.modules.test_network.NetworkTest.test_network_ping…
Remove unused method from pytest engine
Fix event assertion race condition
The peers.conf addition for the x509 state tests broke the salt.modules.publish tests. Move the configuration to the test master's config. Also increase the publish call timeout in the x509 module to make the x509 state tests reliable on all platforms.
Fix salt.modules.publish and salt.states.x509 tests
Cherry-Pick saltstack#52415 into 2019.2.1
- Parse the system's chattr version from the chattr man page - Fix integration.states.test_cron on centos 6
Parse chattr version and fix test case
Remove pchanges Migrate to __utils__['dacl.check_perms']
Fix issues with the win_file tests
s0undt3ch
approved these changes
Apr 26, 2019
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.
no conflicts