WinRM/PSRP: Ensure shell returns UTF-8 output #47404
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
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
2ecf0d9
to
14c38f2
Compare
|
Hi @dagwieers, thank you for submitting this pull-request! |
ansibot
added
affects_2.8
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
14c38f2
to
8b91ac7
Compare
abadger
force-pushed
the
psrp-shell-utf8
branch
from
8b91ac7
to
0d863fa
Compare
ansibot
added
needs_revision
This PR makes UTF-8 output work in PSRP shells.
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
0d863fa
to
8ddad23
Compare
|
Local tests seem to be fine, now we have a psrp only testing location are you able to add a win_shell or win_command test with unicode characters to https://github.com/ansible/ansible/blob/devel/test/integration/targets/connection_psrp/tests.yml. This will test that we don't loose the unicode chars end to end. |
This comment has been minimized.
This comment has been minimized.
ansibot
added
support:core
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
c2103ae
to
8f302e3
Compare
jborean93
reviewed
Oct 23, 2018
dagwieers
force-pushed
the
psrp-shell-utf8
branch
2 times, most recently
from
351c820
to
12dbd83
Compare
ansibot
removed
the
support:core
nitzmahone
approved these changes
Oct 23, 2018
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
12dbd83
to
a72be25
Compare
jborean93
requested changes
Oct 23, 2018
| @@ -59,3 +59,42 @@ | |||
| assert: | |||
| that: | |||
| - async_out.stdout_lines == ["abc"] | |||
|
|
|||
| - name: Output unicode characters from Powershell using PSRP | |||
| raw: | | |||
There was a problem hiding this comment.
Not needed, this is tested above
| - raw_unicode_output.stderr == '' | ||
|
|
||
| - name: Output unicode characters from Powershell using PSRP | ||
| win_command: | |
There was a problem hiding this comment.
do win_command: "powershell.exe -ExecutionPolicy ByPass -Command \"Write-Host '\U0001F4A9'\"". Due to the PyYAML issue you can't put unicode characters that are a surrogate pair in YAML files.
| that: | ||
| - command_unicode_output is changed | ||
| - command_unicode_output.rc == 0 | ||
| - command_unicode_output.stdout == '💩' |
There was a problem hiding this comment.
"command_unicode_output.stdout == '\U0001F4A9\n'". Need to use the \U form and add \n to the end.
| that: | ||
| - shell_unicode_output is changed | ||
| - shell_unicode_output.rc == 0 | ||
| - shell_unicode_output.stdout == '💩' |
There was a problem hiding this comment.
"shell_unicode_output.stdout == '\U0001F4A9\n'". Need to use the \U form and add \n to the end.
| - command_unicode_output.stderr == '' | ||
|
|
||
| - name: Output unicode characters from Powershell using PSRP | ||
| win_shell: | |
There was a problem hiding this comment.
do win_shell: "Write-Host '\U0001F4A9'"
|
@dagwieers you also need to indent the new tests to it lines up with the other tasks. |
dagwieers
force-pushed
the
psrp-shell-utf8
branch
2 times, most recently
from
d3c4e6a
to
3cee841
Compare
ansibot
added
needs_ci
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
3cee841
to
72f2b3e
Compare
dagwieers
force-pushed
the
psrp-shell-utf8
branch
from
72f2b3e
to
216fe32
Compare
ansibot
removed
needs_ci
jborean93
approved these changes
Oct 23, 2018
jborean93
reviewed
Oct 23, 2018
| that: | ||
| - command_unicode_output is changed | ||
| - command_unicode_output.rc == 0 | ||
| - command_unicode_output.stdout == "\U0001F4A9\n" |
There was a problem hiding this comment.
Hopefully this is the last one, you need to quote this entire line for the \U to take effect, e.g. "command_unicode_output.stdout == '\U0001F4A9\n'". Same as the win_shell assertion below.
jborean93
pushed a commit
to jborean93/ansible
that referenced
this pull request
Oct 24, 2018
* WinRM/PSRP: Ensure shell returns UTF-8 output This PR makes UTF-8 output work in PSRP shells. * Add win_command and win_shell integration tests * Fix tests * more test fixes (cherry picked from commit 691ff4b)
|
@dagwieers I've cherry-picked this commit to #47530 so they will be merged together. |
abadger
pushed a commit
that referenced
this pull request
Oct 24, 2018
* WinRM/PSRP: Ensure shell returns UTF-8 output This PR makes UTF-8 output work in PSRP shells. * Add win_command and win_shell integration tests * Fix tests * more test fixes (cherry picked from commit 691ff4b)
|
@jborean93 Thanks ! |
Tomorrow9
pushed a commit
to Tomorrow9/ansible
that referenced
this pull request
Dec 4, 2018
* WinRM/PSRP: Ensure shell returns UTF-8 output This PR makes UTF-8 output work in PSRP shells. * Add win_command and win_shell integration tests * Fix tests * more test fixes
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
This PR makes UTF-8 output work in PSRP shells.
This relates to #46998
ISSUE TYPE
COMPONENT NAME
WinRM/PSRP
ANSIBLE VERSION
v2.8