diff options
| author | Matt Martz <matt@sivel.net> | 2018-06-12 08:46:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 08:46:23 -0500 |
| commit | ad0827e5c09e7d12d6d9a8f1535cc252ced92b81 (patch) | |
| tree | b965c7e625e21fa8d6f5472e3b1b7e4a6240c74f /test/integration/targets/jinja2_native_types | |
| parent | 46ae1a343a9715d6fe9f4d692b528e1206a4b4af (diff) | |
| download | ansible-ad0827e5c09e7d12d6d9a8f1535cc252ced92b81.tar.gz | |
When using ANSIBLE_JINJA2_NATIVE bypass our None filtering in _finalze (#41408)
* When using ANSIBLE_JINJA2_NATIVE bypass our None filtering in _finalize. Fixes #41392
* Add tests for _finalize bypass
* Address python3 failures in tests
Diffstat (limited to 'test/integration/targets/jinja2_native_types')
5 files changed, 20 insertions, 7 deletions
diff --git a/test/integration/targets/jinja2_native_types/runtests.yml b/test/integration/targets/jinja2_native_types/runtests.yml index 8d00f471f5..2e665da4f3 100644 --- a/test/integration/targets/jinja2_native_types/runtests.yml +++ b/test/integration/targets/jinja2_native_types/runtests.yml @@ -29,6 +29,7 @@ b_false: False s_true: "True" s_false: "False" + yaml_none: ~ tasks: - name: check jinja version shell: python -c 'import jinja2; print(jinja2.__version__)' @@ -44,4 +45,5 @@ - import_tasks: test_bool.yml - import_tasks: test_dunder.yml - import_tasks: test_types.yml + - import_tasks: test_none.yml when: is_native diff --git a/test/integration/targets/jinja2_native_types/test_casting.yml b/test/integration/targets/jinja2_native_types/test_casting.yml index 7d4e3edaa3..5b4fe3ac0e 100644 --- a/test/integration/targets/jinja2_native_types/test_casting.yml +++ b/test/integration/targets/jinja2_native_types/test_casting.yml @@ -11,11 +11,11 @@ - assert: that: - 'int_to_str == "2"' - - 'int_to_str|type_debug in ["string", "unicode"]' + - 'int_to_str|type_debug in ["str", "unicode"]' - 'str_to_int == 2' - 'str_to_int|type_debug == "int"' - - 'dict_to_str|type_debug in ["string", "unicode"]' - - 'list_to_str|type_debug in ["string", "unicode"]' + - 'dict_to_str|type_debug in ["str", "unicode"]' + - 'list_to_str|type_debug in ["str", "unicode"]' - 'int_to_bool is sameas true' - 'int_to_bool|type_debug == "bool"' - 'str_true_to_bool is sameas true' diff --git a/test/integration/targets/jinja2_native_types/test_concatentation.yml b/test/integration/targets/jinja2_native_types/test_concatentation.yml index 9a523e543d..478182ab45 100644 --- a/test/integration/targets/jinja2_native_types/test_concatentation.yml +++ b/test/integration/targets/jinja2_native_types/test_concatentation.yml @@ -23,7 +23,7 @@ - assert: that: - 'string_sum == "12"' - - 'string_sum|type_debug in ["string", "unicode"]' + - 'string_sum|type_debug in ["str", "unicode"]' - name: add two lists set_fact: @@ -40,7 +40,7 @@ - assert: that: - - 'list_sum_multi|type_debug in ["string", "unicode"]' + - 'list_sum_multi|type_debug in ["str", "unicode"]' - name: add two dicts set_fact: @@ -58,7 +58,7 @@ - assert: that: - 'list_for_strings == "onetwo"' - - 'list_for_strings|type_debug in ["string", "unicode"]' + - 'list_for_strings|type_debug in ["str", "unicode"]' - name: loop through list with int set_fact: diff --git a/test/integration/targets/jinja2_native_types/test_dunder.yml b/test/integration/targets/jinja2_native_types/test_dunder.yml index 798e771027..46fd4d0a90 100644 --- a/test/integration/targets/jinja2_native_types/test_dunder.yml +++ b/test/integration/targets/jinja2_native_types/test_dunder.yml @@ -20,4 +20,4 @@ - assert: that: - - 'const_dunder|type_debug in ["string", "unicode"]' + - 'const_dunder|type_debug in ["str", "unicode"]' diff --git a/test/integration/targets/jinja2_native_types/test_none.yml b/test/integration/targets/jinja2_native_types/test_none.yml new file mode 100644 index 0000000000..1d26154c71 --- /dev/null +++ b/test/integration/targets/jinja2_native_types/test_none.yml @@ -0,0 +1,11 @@ +- name: test none + set_fact: + none_var: "{{ yaml_none }}" + none_var_direct: "{{ None }}" + +- assert: + that: + - 'none_var is sameas none' + - 'none_var|type_debug == "NoneType"' + - 'none_var_direct is sameas none' + - 'none_var_direct|type_debug == "NoneType"' |