diff options
| author | David Shrewsbury <Shrews@users.noreply.github.com> | 2020-11-17 12:58:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 12:58:19 -0500 |
| commit | 570aed091348cb2898086526a091e7848c73f65a (patch) | |
| tree | a5b6f76f9cacd3f5aeb4812dc4f9ed618e063f25 /test/integration/targets/ansible | |
| parent | 07248e5ec1ed7cc7e2c8f77d9a2f635a58eca610 (diff) | |
| download | ansible-570aed091348cb2898086526a091e7848c73f65a.tar.gz | |
ansible-doc role arg spec support (#72120)
* Support listing roles in text and JSON
* Change tests for unfrack'd playbook_dir var
These tests were using '/tmp' for testing the setting of the playbook_dir
var. Now that we unfrack that var, MacOS will change this to '/private/tmp'
causing the tests to fail. We can choose a path that does not exist (since
unfrack does not validate existence) so that we can guarantee unfracking
will not change the value.
Diffstat (limited to 'test/integration/targets/ansible')
| -rw-r--r-- | test/integration/targets/ansible/playbookdir_cfg.ini | 2 | ||||
| -rwxr-xr-x | test/integration/targets/ansible/runme.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/targets/ansible/playbookdir_cfg.ini b/test/integration/targets/ansible/playbookdir_cfg.ini index f4bf8af895..16670c5b83 100644 --- a/test/integration/targets/ansible/playbookdir_cfg.ini +++ b/test/integration/targets/ansible/playbookdir_cfg.ini @@ -1,2 +1,2 @@ [defaults] -playbook_dir = /tmp +playbook_dir = /doesnotexist/tmp diff --git a/test/integration/targets/ansible/runme.sh b/test/integration/targets/ansible/runme.sh index 42130961eb..fc79e33e73 100755 --- a/test/integration/targets/ansible/runme.sh +++ b/test/integration/targets/ansible/runme.sh @@ -25,13 +25,13 @@ ansible-config view -c ./no-extension 2> err2.txt || grep -q 'Unsupported config rm -f err*.txt # test setting playbook_dir via envvar -ANSIBLE_PLAYBOOK_DIR=/tmp ansible localhost -m debug -a var=playbook_dir | grep '"playbook_dir": "/tmp"' +ANSIBLE_PLAYBOOK_DIR=/doesnotexist/tmp ansible localhost -m debug -a var=playbook_dir | grep '"playbook_dir": "/doesnotexist/tmp"' # test setting playbook_dir via cmdline -ansible localhost -m debug -a var=playbook_dir --playbook-dir=/tmp | grep '"playbook_dir": "/tmp"' +ansible localhost -m debug -a var=playbook_dir --playbook-dir=/doesnotexist/tmp | grep '"playbook_dir": "/doesnotexist/tmp"' # test setting playbook dir via ansible.cfg -env -u ANSIBLE_PLAYBOOK_DIR ANSIBLE_CONFIG=./playbookdir_cfg.ini ansible localhost -m debug -a var=playbook_dir | grep '"playbook_dir": "/tmp"' +env -u ANSIBLE_PLAYBOOK_DIR ANSIBLE_CONFIG=./playbookdir_cfg.ini ansible localhost -m debug -a var=playbook_dir | grep '"playbook_dir": "/doesnotexist/tmp"' # test adhoc callback triggers ANSIBLE_STDOUT_CALLBACK=callback_debug ANSIBLE_LOAD_CALLBACK_PLUGINS=1 ansible --playbook-dir . testhost -i ../../inventory -m ping | grep -E '^v2_' | diff -u adhoc-callback.stdout - |