ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 22:30:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixing template integration test for python 2.6 versions

Browse source 
No longer immediately fallback to to_json if simplejson is not installed
This commit is contained in:
James Cammarata 2015-12-16 18:21:47 -05:00
commit 857456ea5f
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/filter/core.py
View file

@ -100,9 +100,11 @@ def to_nice_json(a, *args, **kw):
else: else:
if major >= 2: if major >= 2:
return simplejson.dumps(a, indent=4, sort_keys=True, *args, **kw) return simplejson.dumps(a, indent=4, sort_keys=True, *args, **kw)
try:
return json.dumps(a, indent=4, sort_keys=True, cls=AnsibleJSONEncoder, *args, **kw)
except:
# Fallback to the to_json filter # Fallback to the to_json filter
return to_json(a, *args, **kw) return to_json(a, *args, **kw)
return json.dumps(a, indent=4, sort_keys=True, cls=AnsibleJSONEncoder, *args, **kw)
def bool(a): def bool(a):
''' return a bool for the arg ''' ''' return a bool for the arg '''

7
test/integration/roles/test_template/tasks/main.yml
View file

@ -49,13 +49,6 @@
- name: copy known good into place - name: copy known good into place
copy: src=foo.txt dest={{output_dir}}/foo.txt copy: src=foo.txt dest={{output_dir}}/foo.txt
# Seems that python-2.6 now outputs the same format as everywhere else?
# when: pyver.stdout != '2.6'
#- name: copy known good into place
# copy: src=foo-py26.txt dest={{output_dir}}/foo.txt
# when: pyver.stdout == '2.6'
- name: compare templated file to known good - name: compare templated file to known good
shell: diff {{output_dir}}/foo.templated {{output_dir}}/foo.txt shell: diff {{output_dir}}/foo.templated {{output_dir}}/foo.txt
register: diff_result register: diff_result