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

Always transfer bytes from fileserver roots #48714

Merged
merged 6 commits into from Jul 30, 2018

Conversation

Projects
None yet
3 participants
@dwoz
Contributor

dwoz commented Jul 23, 2018

What does this PR do?

Fixes a state test on windows (py3) where utf-8 data was getting
improperly decoded before fileserver sends the data to a client.

What issues does this PR fix or reference?

https://jenkinsci.saltstack.com/job/2018.3/view/Python3/job/salt-windows-2016-py3/100/testReport/junit/integration.modules.test_state/StateModuleTest/test_state_sls_unicode_characters/

Tests written?

Yes - Adding new test to show command output nuances on windows.

Commits signed with GPG?

Yes

Always trasfer bytes from fileserver roots
Fixes a state test on windows (py3) where utf-8 data was getting
improperly decoded before fileserver sends the data to a client.

@dwoz dwoz requested review from terminalmage and twangboy Jul 23, 2018

@dwoz dwoz changed the title from Always trasfer bytes from fileserver roots to Always transfer bytes from fileserver roots Jul 23, 2018

@dwoz

This comment has been minimized.

Contributor

dwoz commented Jul 24, 2018

re-run py

@dwoz

This comment has been minimized.

Contributor

dwoz commented Jul 25, 2018

@terminalmage ping. :)

terminalmage and others added some commits Jul 27, 2018

Simplify file contents in roots fileserver test
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
Merge pull request #2 from terminalmage/state_echo_fix
Simplify file contents in roots fileserver test
@terminalmage

This is good to merge pending test results and @dwoz ensuring that my contributions did not break tests on Windows.

@dwoz dwoz force-pushed the dwoz:state_echo_fix branch from b5eee7b to 7aaef18 Jul 30, 2018

@dwoz dwoz force-pushed the dwoz:state_echo_fix branch from 7aaef18 to ce3ed43 Jul 30, 2018

@dwoz dwoz merged commit 69f8121 into saltstack:2018.3 Jul 30, 2018

5 of 8 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
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-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details

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

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