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

File state line ending fixes #49197

Merged
merged 1 commit into from Aug 20, 2018

Conversation

Projects
None yet
4 participants
@dwoz
Contributor

dwoz commented Aug 19, 2018

What does this PR do?

Fix tests in integration.states.test_file

Tests written?

No - Fixing tests

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from gtmanfred Aug 19, 2018

@gtmanfred

I would also like for @terminalmage to just double check this.

@@ -4080,7 +4080,12 @@ def _get_local_file_source_sum(path):
urlparsed_source.netloc, urlparsed_source.path).rstrip(os.sep)
unix_local_source = parsed_scheme in ('file', '')

This comment has been minimized.

@gtmanfred

gtmanfred Aug 20, 2018

Contributor

is this line still needed?

This comment has been minimized.

@dwoz

dwoz Aug 20, 2018

Contributor

Yes, It get's used later in the method.

This comment has been minimized.

@gtmanfred

gtmanfred Aug 20, 2018

Contributor

cool

@gtmanfred gtmanfred requested a review from terminalmage Aug 20, 2018

@gtmanfred gtmanfred merged commit 644ba3d into saltstack:2018.3 Aug 20, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 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-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

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

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