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

Revert newline translation change #49243

Merged
merged 1 commit into from Aug 22, 2018

Conversation

Projects
None yet
4 participants
@dwoz
Contributor

dwoz commented Aug 22, 2018

What does this PR do?

Revert un-needed newline translation. On windows, newlines will be CRLF since we added unix2dos to kitchen.

fixes https://jenkinsci.saltstack.com/job/2018.3/job/salt-windows-2016-py2/28/#showFailuresLink

unit.fileserver.test_roots.RootsTest.test_file_hash
unit.fileserver.test_roots.RootsTest.test_serve_file

Tests written?

No - Fixing 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.

Revert newline translation change
On windows, newlines will be CRLF since we added unix2dos to kitchen.

@dwoz dwoz requested a review from terminalmage Aug 22, 2018

@cachedout cachedout merged commit 75beede into saltstack:2018.3 Aug 22, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint 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

rallytime added a commit that referenced this pull request Aug 28, 2018

@dwoz dwoz deleted the dwoz:fileserver_tests branch Sep 17, 2018

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