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

Multiple block replace test fixes #48960

Merged
merged 1 commit into from Aug 6, 2018

Conversation

Projects
None yet
2 participants
@dwoz
Contributor

dwoz commented Aug 6, 2018

What does this PR do?

Use LF for newlines on block replace tests where the content comes from a string on the class. These strings always have LF for line endings.

Fixes the failures in: integration.states.test_file.BlockreplaceTest
https://jenkinsci.saltstack.com/job/2017.7/job/salt-windows-2016-py2/13/

Tests written?

No - Fixing tests on Windows

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from Ch3LL Aug 6, 2018

@dwoz dwoz merged commit 1a1bda0 into saltstack:2017.7 Aug 6, 2018

8 checks passed

WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@dwoz dwoz deleted the dwoz:block_replace_tests branch Aug 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment