Fix integration.modules.test_state for Windows
#45308
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
twangboy
force-pushed
the
win_fix_test_state
branch
2 times, most recently
from
8fe44cf
to
dfe91b6
Compare
rallytime
suggested changes
Jan 9, 2018
salt/states/file.py
Outdated
| deny_perms=win_deny_perms, | ||
| inheritance=win_inheritance, | ||
| reset=win_perms_reset) | ||
| try: |
There was a problem hiding this comment.
This section of code would be cleaner if you encompassed just the file.check_perms command in the try/except instead of the if is_windows check as well.
rallytime
added
the
bugfix-bckport
|
@twangboy I can do the backport once this is ready. This is causing a test failure, however: https://jenkins.saltstack.com/job/PR/job/salt-pr-linode-ubuntu14-n/18415/ Can you take a look? |
Fixes the following tests: - test_get_file_from_env_in_top_match - test_issue_1896_file_append_source - test_state_sls_id_test Fixes in issue in file.managed where a command execution error was being raised if the target file did not exist.
twangboy
force-pushed
the
win_fix_test_state
branch
from
dfe91b6
to
0be187c
Compare
twangboy
changed the title
integration.modules.test_state for Windowsunit.states.test_file for Windows
twangboy
changed the title
unit.states.test_file for Windowsintegration.modules.test_state for Windows
- Fix problem with invalid characters in requisites.prereq_simple2 - Fix problem with true/false commands in Windows. Need to use exit - Fix some issues with hard-coded paths to /tmp
|
@rallytime This should fix the failing linux test. |
|
@twangboy This isn't back-porting cleanly. Can you make a separate PR for this against 2107.7? |
rallytime
removed
the
bugfix-bckport
twangboy
added a commit
to twangboy/salt
that referenced
this pull request
Jan 10, 2018
rallytime
pushed a commit
that referenced
this pull request
Jan 11, 2018
Backport changes from #45308
rallytime
pushed a commit
to rallytime/salt
that referenced
this pull request
Jan 11, 2018
This was referenced Jan 17, 2018
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?
Fixes failing tests on Windows
test_stateprereq_simple2state file that had somestrange characters that were causing failure in windows (
<C2><A0>)watch_anyto handle WindowsFixes an issue in
file.managedwhere a command execution error wasbeing raised if the target file did not exist.
@rallytime Need to backport this to 2017.7. Should I do a separate PR?
What issues does this PR fix or reference?
saltstack/salt-ci-images#439
Tests written?
Yes
Commits signed with GPG?
Yes