mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 13:52:54 +00:00
psrp - fix unicode handling in Python 2 (#47461)
* psrp - fix unicode handling in Python 2 * skip psrp become test when on Server 2008
This commit is contained in:
3
test/integration/targets/connection_psrp/inventory.ini
Normal file
3
test/integration/targets/connection_psrp/inventory.ini
Normal file
@@ -0,0 +1,3 @@
|
||||
[windows:vars]
|
||||
ansible_connection=psrp
|
||||
ansible_psrp_cert_validation=ignore
|
||||
@@ -2,14 +2,18 @@
|
||||
|
||||
set -eux
|
||||
|
||||
pip install pypsrp
|
||||
python.py -m pip install pypsrp
|
||||
cd ../connection
|
||||
|
||||
INVENTORY=../../inventory.winrm ./test.sh \
|
||||
-i ../connection_psrp/inventory.ini \
|
||||
-e target_hosts=winrm \
|
||||
-e action_prefix=win_ \
|
||||
-e local_tmp=/tmp/ansible-local \
|
||||
-e remote_tmp=c:/windows/temp/ansible-remote \
|
||||
-e ansible_psrp_cert_validation=False \
|
||||
-c psrp \
|
||||
"$@"
|
||||
|
||||
cd ../connection_psrp
|
||||
|
||||
ansible-playbook -i ../../inventory.winrm -i inventory.ini tests.yml \
|
||||
"$@"
|
||||
|
||||
61
test/integration/targets/connection_psrp/tests.yml
Normal file
61
test/integration/targets/connection_psrp/tests.yml
Normal file
@@ -0,0 +1,61 @@
|
||||
---
|
||||
# these are extra tests for psrp that aren't covered under test/integration/targets/connection/*
|
||||
- name: test out psrp specific tests
|
||||
hosts: winrm
|
||||
serial: 1
|
||||
gather_facts: no
|
||||
|
||||
tasks:
|
||||
- name: test complex objects in raw output
|
||||
# until PyYAML is upgraded to 4.x we need to use the \U escape for a unicode codepoint
|
||||
# and enclose in a quote to it translates the \U
|
||||
raw: "
|
||||
[PSCustomObject]@{string = 'string'};
|
||||
[PSCustomObject]@{unicode = 'poo - \U0001F4A9'};
|
||||
[PSCustomObject]@{integer = 1};
|
||||
[PSCustomObject]@{list = @(1, 2)};
|
||||
Get-Service -Name winrm;
|
||||
Write-Output -InputObject 'string - \U0001F4A9';"
|
||||
register: raw_out
|
||||
|
||||
- name: assert complex objects in raw output
|
||||
assert:
|
||||
that:
|
||||
- raw_out.stdout_lines|count == 6
|
||||
- "raw_out.stdout_lines[0] == 'string: string'"
|
||||
- "raw_out.stdout_lines[1] == 'unicode: poo - \U0001F4A9'"
|
||||
- "raw_out.stdout_lines[2] == 'integer: 1'"
|
||||
- "raw_out.stdout_lines[3] == \"list: [1, 2]\""
|
||||
- raw_out.stdout_lines[4] == "winrm"
|
||||
- raw_out.stdout_lines[5] == "string - \U0001F4A9"
|
||||
|
||||
# Become only works on Server 2008 when running with basic auth, skip this host for now as it is too complicated to
|
||||
# override the auth protocol in the tests.
|
||||
- name: check if we running on Server 2008
|
||||
win_shell: '[System.Environment]::OSVersion.Version -ge [Version]"6.1"'
|
||||
register: os_version
|
||||
|
||||
- name: test out become with psrp
|
||||
win_whoami:
|
||||
when: os_version|bool
|
||||
register: whoami_out
|
||||
become: yes
|
||||
become_method: runas
|
||||
become_user: SYSTEM
|
||||
|
||||
- name: assert test out become with psrp
|
||||
assert:
|
||||
that:
|
||||
- whoami_out.account.sid == "S-1-5-18"
|
||||
when: os_version|bool
|
||||
|
||||
- name: test out async with psrp
|
||||
win_shell: Start-Sleep -Seconds 2; Write-Output abc
|
||||
async: 5
|
||||
poll: 1
|
||||
register: async_out
|
||||
|
||||
- name: assert est out async with psrp
|
||||
assert:
|
||||
that:
|
||||
- async_out.stdout_lines == ["abc"]
|
||||
Reference in New Issue
Block a user