mirror of https://github.com/ansible/ansible.git
uri: provide raw_content, parse json without double-decoding. Fixes #7586
Regression potential: - `raw_content` is written to `dest` file instead of decoded `content` - `raw_content` doubles module replypull/11014/head
Leonid Evdokimov
10 years ago
committed by
Toshio Kuratomi
parent
46d7f5281a
commit
ae9ba4afa1
@ -0,0 +1,9 @@
|
||||
The files were taken from http://www.json.org/JSON_checker/
|
||||
> If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
|
||||
|
||||
Difference with JSON_checker dataset:
|
||||
- *${n}.json renamed to *${n-1}.json to be 0-based
|
||||
- fail0.json renamed to pass3.json as python json module allows JSON payload to be string
|
||||
- fail17.json renamed to pass4.json as python json module has no problems with deep structures
|
||||
- fail32.json renamed to fail0.json to fill gap
|
||||
- fail31.json renamed to fail17.json to fill gap
|
||||
@ -0,0 +1 @@
|
||||
["mismatch"}
|
||||
@ -0,0 +1 @@
|
||||
["Unclosed array"
|
||||
@ -0,0 +1 @@
|
||||
{"Illegal expression": 1 + 2}
|
||||
@ -0,0 +1 @@
|
||||
{"Illegal invocation": alert()}
|
||||
@ -0,0 +1 @@
|
||||
{"Numbers cannot have leading zeroes": 013}
|
||||
@ -0,0 +1 @@
|
||||
{"Numbers cannot be hex": 0x14}
|
||||
@ -0,0 +1 @@
|
||||
["Illegal backslash escape: \x15"]
|
||||
@ -0,0 +1 @@
|
||||
[\naked]
|
||||
@ -0,0 +1 @@
|
||||
["Illegal backslash escape: \017"]
|
||||
@ -0,0 +1 @@
|
||||
{"Comma instead if closing brace": true,
|
||||
@ -0,0 +1 @@
|
||||
{"Missing colon" null}
|
||||
@ -0,0 +1 @@
|
||||
{"Double colon":: null}
|
||||
@ -0,0 +1 @@
|
||||
{unquoted_key: "keys must be quoted"}
|
||||
@ -0,0 +1 @@
|
||||
{"Comma instead of colon", null}
|
||||
@ -0,0 +1 @@
|
||||
["Colon instead of comma": false]
|
||||
@ -0,0 +1 @@
|
||||
["Bad value", truth]
|
||||
@ -0,0 +1 @@
|
||||
['single quote']
|
||||
@ -0,0 +1 @@
|
||||
[" tab character in string "]
|
||||
@ -0,0 +1 @@
|
||||
["tab\ character\ in\ string\ "]
|
||||
@ -0,0 +1,2 @@
|
||||
["line
|
||||
break"]
|
||||
@ -0,0 +1,2 @@
|
||||
["line\
|
||||
break"]
|
||||
@ -0,0 +1 @@
|
||||
[0e]
|
||||
@ -0,0 +1 @@
|
||||
[0e+]
|
||||
@ -0,0 +1 @@
|
||||
["extra comma",]
|
||||
@ -0,0 +1 @@
|
||||
[0e+-1]
|
||||
@ -0,0 +1 @@
|
||||
["double extra comma",,]
|
||||
@ -0,0 +1 @@
|
||||
[ , "<-- missing value"]
|
||||
@ -0,0 +1 @@
|
||||
["Comma after the close"],
|
||||
@ -0,0 +1 @@
|
||||
["Extra close"]]
|
||||
@ -0,0 +1 @@
|
||||
{"Extra comma": true,}
|
||||
@ -0,0 +1 @@
|
||||
{"Extra value after close": true} "misplaced quoted value"
|
||||
@ -0,0 +1,58 @@
|
||||
[
|
||||
"JSON Test Pattern pass1",
|
||||
{"object with 1 member":["array with 1 element"]},
|
||||
{},
|
||||
[],
|
||||
-42,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
{
|
||||
"integer": 1234567890,
|
||||
"real": -9876.543210,
|
||||
"e": 0.123456789e-12,
|
||||
"E": 1.234567890E+34,
|
||||
"": 23456789012E66,
|
||||
"zero": 0,
|
||||
"one": 1,
|
||||
"space": " ",
|
||||
"quote": "\"",
|
||||
"backslash": "\\",
|
||||
"controls": "\b\f\n\r\t",
|
||||
"slash": "/ & \/",
|
||||
"alpha": "abcdefghijklmnopqrstuvwyz",
|
||||
"ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
|
||||
"digit": "0123456789",
|
||||
"0123456789": "digit",
|
||||
"special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
|
||||
"hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
|
||||
"true": true,
|
||||
"false": false,
|
||||
"null": null,
|
||||
"array":[ ],
|
||||
"object":{ },
|
||||
"address": "50 St. James Street",
|
||||
"url": "http://www.JSON.org/",
|
||||
"comment": "// /* <!-- --",
|
||||
"# -- --> */": " ",
|
||||
" s p a c e d " :[1,2 , 3
|
||||
|
||||
,
|
||||
|
||||
4 , 5 , 6 ,7 ],"compact":[1,2,3,4,5,6,7],
|
||||
"jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
|
||||
"quotes": "" \u0022 %22 0x22 034 "",
|
||||
"\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
|
||||
: "A key can be any string"
|
||||
},
|
||||
0.5 ,98.6
|
||||
,
|
||||
99.44
|
||||
,
|
||||
|
||||
1066,
|
||||
1e1,
|
||||
0.1e1,
|
||||
1e-1,
|
||||
1e00,2e+00,2e-00
|
||||
,"rosebud"]
|
||||
@ -0,0 +1 @@
|
||||
[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"JSON Test Pattern pass3": {
|
||||
"The outermost value": "must be an object or array.",
|
||||
"In this test": "It is an object."
|
||||
}
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
"A JSON payload should be an object or array, not a string."
|
||||
@ -0,0 +1 @@
|
||||
[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
|
||||
@ -0,0 +1,3 @@
|
||||
---
|
||||
- name: stop SimpleHTTPServer
|
||||
shell: start-stop-daemon --stop --pidfile {{ output_dir }}/SimpleHTTPServer.pid --exec {{ py2.stdout }}
|
||||
@ -0,0 +1,2 @@
|
||||
dependencies:
|
||||
- prepare_tests
|
||||
@ -0,0 +1,120 @@
|
||||
# test code for the uri module
|
||||
# (c) 2014, Leonid Evdokimov <leon@darkk.net.ru>
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: set role facts
|
||||
set_fact:
|
||||
http_port: 15260
|
||||
files_dir: '{{ _original_file|dirname }}/../files'
|
||||
checkout_dir: '{{ output_dir }}/git'
|
||||
|
||||
- name: verify that python2 is installed so this test can continue
|
||||
shell: which python2
|
||||
register: py2
|
||||
|
||||
- name: start SimpleHTTPServer
|
||||
shell: start-stop-daemon --start --pidfile {{ output_dir }}/SimpleHTTPServer.pid --background --make-pidfile --chdir {{ files_dir }} --exec {{ py2.stdout }} -- -m SimpleHTTPServer {{ http_port }}
|
||||
notify: stop SimpleHTTPServer
|
||||
|
||||
- wait_for: port={{ http_port }}
|
||||
|
||||
|
||||
- name: md5 pass_json
|
||||
stat: path={{ files_dir }}/{{ item }}.json get_md5=yes
|
||||
register: pass_md5
|
||||
with_sequence: start=0 end=4 format=pass%d
|
||||
|
||||
- name: fetch pass_json
|
||||
uri: return_content=yes url=http://localhost:{{ http_port }}/{{ item }}.json
|
||||
register: pass
|
||||
with_sequence: start=0 end=4 format=pass%d
|
||||
|
||||
- name: check pass_json
|
||||
assert:
|
||||
that:
|
||||
- '"json" in item.1'
|
||||
- item.0.stat.md5 == item.1.raw_content | md5
|
||||
with_together:
|
||||
- pass_md5.results
|
||||
- pass.results
|
||||
|
||||
|
||||
- name: md5 fail_json
|
||||
stat: path={{ files_dir }}/{{ item }}.json get_md5=yes
|
||||
register: fail_md5
|
||||
with_sequence: start=0 end=30 format=fail%d
|
||||
|
||||
- name: fetch fail_json
|
||||
uri: return_content=yes url=http://localhost:{{ http_port }}/{{ item }}.json
|
||||
register: fail
|
||||
with_sequence: start=0 end=30 format=fail%d
|
||||
|
||||
- name: check fail_json
|
||||
assert:
|
||||
that:
|
||||
- item.0.stat.md5 == item.1.raw_content | md5
|
||||
- '"json" not in item.1'
|
||||
with_together:
|
||||
- fail_md5.results
|
||||
- fail.results
|
||||
|
||||
|
||||
- name: check content != raw_content
|
||||
assert:
|
||||
that: item.content != item.raw_content
|
||||
with_items:
|
||||
- '{{ pass.results.0 }}'
|
||||
- '{{ fail.results.14 }}'
|
||||
- '{{ fail.results.15 }}'
|
||||
- '{{ fail.results.16 }}'
|
||||
- '{{ fail.results.27 }}'
|
||||
|
||||
- name: check content == raw_content
|
||||
assert:
|
||||
that: item.content == item.raw_content
|
||||
with_items:
|
||||
- '{{ pass.results.1 }}'
|
||||
- '{{ pass.results.2 }}'
|
||||
- '{{ pass.results.3 }}'
|
||||
- '{{ pass.results.4 }}'
|
||||
- '{{ fail.results.0 }}'
|
||||
- '{{ fail.results.1 }}'
|
||||
- '{{ fail.results.2 }}'
|
||||
- '{{ fail.results.3 }}'
|
||||
- '{{ fail.results.4 }}'
|
||||
- '{{ fail.results.5 }}'
|
||||
- '{{ fail.results.6 }}'
|
||||
- '{{ fail.results.7 }}'
|
||||
- '{{ fail.results.8 }}'
|
||||
- '{{ fail.results.9 }}'
|
||||
- '{{ fail.results.10 }}'
|
||||
- '{{ fail.results.11 }}'
|
||||
- '{{ fail.results.12 }}'
|
||||
- '{{ fail.results.13 }}'
|
||||
- '{{ fail.results.17 }}'
|
||||
- '{{ fail.results.18 }}'
|
||||
- '{{ fail.results.19 }}'
|
||||
- '{{ fail.results.20 }}'
|
||||
- '{{ fail.results.21 }}'
|
||||
- '{{ fail.results.22 }}'
|
||||
- '{{ fail.results.23 }}'
|
||||
- '{{ fail.results.24 }}'
|
||||
- '{{ fail.results.25 }}'
|
||||
- '{{ fail.results.26 }}'
|
||||
- '{{ fail.results.28 }}'
|
||||
- '{{ fail.results.29 }}'
|
||||
- '{{ fail.results.30 }}'
|
||||
Loading…
Reference in New Issue