diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-08-05 11:28:21 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-08-15 23:12:08 -0700 |
| commit | af2073d057b30d57d1d4e5e476b25c5c61e14f47 (patch) | |
| tree | 9b23fe8226ff549745096f1b36f61504c56a994d /test/units/parsing | |
| parent | d50d65d44887810363d9be880b4314dd0b60dda4 (diff) | |
| download | ansible-af2073d057b30d57d1d4e5e476b25c5c61e14f47.tar.gz | |
metadata 1.1
* Add network value to support_by field.
* New support_by value, certified
* Deprecate curated in favor of certified
* Add conversion from 1.0 to 1.1 to metadata-tool
* Add supported by Red Hat field to ansible-doc output
Diffstat (limited to 'test/units/parsing')
| -rw-r--r-- | test/units/parsing/test_metadata.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/units/parsing/test_metadata.py b/test/units/parsing/test_metadata.py index 72adc845c1..6622338567 100644 --- a/test/units/parsing/test_metadata.py +++ b/test/units/parsing/test_metadata.py @@ -41,14 +41,14 @@ from foo import bar """ STANDARD_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0', +ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], 'supported_by': 'core'} """ TEXT_STD_METADATA = b""" ANSIBLE_METADATA = u''' -metadata_version: '1.0' +metadata_version: '1.1' status: - 'stableinterface' supported_by: 'core' @@ -57,7 +57,7 @@ supported_by: 'core' BYTES_STD_METADATA = b""" ANSIBLE_METADATA = b''' -metadata_version: '1.0' +metadata_version: '1.1' status: - 'stableinterface' supported_by: 'core' @@ -65,45 +65,45 @@ supported_by: 'core' """ TRAILING_COMMENT_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0', +ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], 'supported_by': 'core'} # { Testing } """ MULTIPLE_STATEMENTS_METADATA = b""" -DOCUMENTATION = "" ; ANSIBLE_METADATA = {'metadata_version': '1.0', +DOCUMENTATION = "" ; ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], 'supported_by': 'core'} ; RETURNS = "" """ EMBEDDED_COMMENT_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0', +ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], # { Testing } 'supported_by': 'core'} """ HASH_SYMBOL_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0 # 4', +ANSIBLE_METADATA = {'metadata_version': '1.1 # 4', 'status': ['stableinterface'], 'supported_by': 'core # Testing '} """ HASH_SYMBOL_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0 # 4', +ANSIBLE_METADATA = {'metadata_version': '1.1 # 4', 'status': ['stableinterface'], 'supported_by': 'core # Testing '} """ HASH_COMBO_METADATA = b""" -ANSIBLE_METADATA = {'metadata_version': '1.0 # 4', +ANSIBLE_METADATA = {'metadata_version': '1.1 # 4', 'status': ['stableinterface'], # { Testing } 'supported_by': 'core'} # { Testing } """ -METADATA = {'metadata_version': '1.0', 'status': ['stableinterface'], 'supported_by': 'core'} -HASH_SYMBOL_METADATA = {'metadata_version': '1.0 # 4', 'status': ['stableinterface'], 'supported_by': 'core'} +METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], 'supported_by': 'core'} +HASH_SYMBOL_METADATA = {'metadata_version': '1.1 # 4', 'status': ['stableinterface'], 'supported_by': 'core'} METADATA_EXAMPLES = ( # Standard import @@ -225,15 +225,15 @@ def test_module_data_param_given_with_offset(): def test_invalid_dict_metadata(): with pytest.raises(SyntaxError): - assert md.extract_metadata(module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.0",\n' + REGULAR_IMPORTS) + assert md.extract_metadata(module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.1",\n' + REGULAR_IMPORTS) with pytest.raises(md.ParseError, message='Unable to find the end of dictionary'): - assert md.extract_metadata(module_ast=ast.parse(LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.0"}\n' + REGULAR_IMPORTS), - module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.0",\n' + REGULAR_IMPORTS, + assert md.extract_metadata(module_ast=ast.parse(LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.1"}\n' + REGULAR_IMPORTS), + module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.1",\n' + REGULAR_IMPORTS, offsets=True) def test_multiple_statements_limitation(): with pytest.raises(md.ParseError, message='Multiple statements per line confuses the module metadata parser.'): - assert md.extract_metadata(module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.0"}; a=b\n' + REGULAR_IMPORTS, + assert md.extract_metadata(module_data=LICENSE + FUTURE_IMPORTS + b'ANSIBLE_METADATA={"metadata_version": "1.1"}; a=b\n' + REGULAR_IMPORTS, offsets=True) |