Skip to content
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

Cherry-Pick #52415 into 2019.2.1 #52601

Merged
merged 14 commits into from
Apr 21, 2019
Merged

Cherry-Pick #52415 into 2019.2.1 #52601

merged 14 commits into from
Apr 21, 2019

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Apr 18, 2019

Cherry-pick #52415 into 2019.2.1

terminalmage and others added 12 commits April 18, 2019 10:56
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
@ghost
Copy link

ghost commented Apr 18, 2019

@Ch3LL, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ryan-lane and @tkwilliams to be potential reviewers.

@Ch3LL Ch3LL changed the title Cherry-Pick #52415 into 2019.2 Cherry-Pick #52415 into 2019.2.1 Apr 18, 2019
@dwoz dwoz merged commit f7d823c into saltstack:2019.2.1 Apr 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants