diff options
author | Brian Coca <bcoca@users.noreply.github.com> | 2017-04-21 16:07:38 -0400 |
---|---|---|
committer | Brian Coca <brian.coca+git@gmail.com> | 2017-04-21 16:09:48 -0400 |
commit | 0878f45a6cdd62c071ff0b027a65fdc9e6136336 (patch) | |
tree | 3ad2352b1ec960ce60fd45a66cf0f138aa1b2ee3 /test/integration/targets | |
parent | a71b6041f63bb778202238c8f0ba1969cc36596f (diff) | |
download | ansible-0878f45a6cdd62c071ff0b027a65fdc9e6136336.tar.gz |
keep unsafe .. unsafe (#23742)
* keep unsafe .. unsafe
fixes #23734, which was broken in previous fix that allowed non string types to be templated
use new 'is_template' function vs bastardizing others
refactored clean_data to allow for arbitrary data structures to clean
fixed/removed some tests
(cherry picked from commit 4594bee65ae2123061e2f262503310a9a57a5a59)
Diffstat (limited to 'test/integration/targets')
-rw-r--r-- | test/integration/targets/copy/tasks/main.yml | 2 | ||||
-rw-r--r-- | test/integration/targets/win_path/tasks/main.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/targets/copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml index 128c0a793e..af95facfbe 100644 --- a/test/integration/targets/copy/tasks/main.yml +++ b/test/integration/targets/copy/tasks/main.yml @@ -157,7 +157,7 @@ - name: assert recursive copied directories mode assert: that: - - "{{item.stat.mode}} == 0700" + - "item.stat.mode == '0700'" with_items: "{{dir_stats.results}}" diff --git a/test/integration/targets/win_path/tasks/main.yml b/test/integration/targets/win_path/tasks/main.yml index c51e0b0377..31dcda8582 100644 --- a/test/integration/targets/win_path/tasks/main.yml +++ b/test/integration/targets/win_path/tasks/main.yml @@ -23,8 +23,8 @@ assert: that: - item.0 | changed - - item.0.path_value == "C:\\{{ item.0.item }}Path" - - item.1.stdout_lines[0] == 'C:\\{{ item.0.item }}Path' + - item.0.path_value == "C:\\" + item.0.item + "Path" + - item.1.stdout_lines[0] == 'C:\\' + item.0.item + 'Path' with_together: - "{{ pathout.results }}" - "{{ varout.results }}" |