From bca50b47eda70421ea2a488d32db9bd4763a557d Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 15 Jan 2019 00:24:03 -0800 Subject: [PATCH] Switch set_fact test to private inventory. Fixes a test failure when there is no explicit localhost in inventory. --- test/integration/targets/set_fact/inventory | 3 +++ test/integration/targets/set_fact/runme.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 test/integration/targets/set_fact/inventory diff --git a/test/integration/targets/set_fact/inventory b/test/integration/targets/set_fact/inventory new file mode 100644 index 0000000000..e1a42d86ea --- /dev/null +++ b/test/integration/targets/set_fact/inventory @@ -0,0 +1,3 @@ +[testgroup] +testhost ansible_connection=local +localhost diff --git a/test/integration/targets/set_fact/runme.sh b/test/integration/targets/set_fact/runme.sh index 14bed98f6d..426d2f009e 100755 --- a/test/integration/targets/set_fact/runme.sh +++ b/test/integration/targets/set_fact/runme.sh @@ -6,17 +6,17 @@ MYTMPDIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir') trap 'rm -rf "${MYTMPDIR}"' EXIT # ensure we can incrementally set fact via loopi, injection or not -ANSIBLE_INJECT_FACT_VARS=0 ansible-playbook -i ../../inventory incremental.yml -ANSIBLE_INJECT_FACT_VARS=1 ansible-playbook -i ../../inventory incremental.yml +ANSIBLE_INJECT_FACT_VARS=0 ansible-playbook -i inventory incremental.yml +ANSIBLE_INJECT_FACT_VARS=1 ansible-playbook -i inventory incremental.yml # ensure we dont have spurious warnings do to clean_facts -ansible-playbook -i ../../inventory nowarn_clean_facts.yml | grep '[WARNING]: Removed restricted key from module data: ansible_ssh_common_args' && exit 1 +ansible-playbook -i inventory nowarn_clean_facts.yml | grep '[WARNING]: Removed restricted key from module data: ansible_ssh_common_args' && exit 1 # test cached feature export ANSIBLE_CACHE_PLUGIN=jsonfile ANSIBLE_CACHE_PLUGIN_CONNECTION="${MYTMPDIR}" -ansible-playbook -i ../../inventory "$@" set_fact_cached_1.yml -ansible-playbook -i ../../inventory "$@" set_fact_cached_2.yml -ansible-playbook -i ../../inventory --flush-cache "$@" set_fact_no_cache.yml +ansible-playbook -i inventory "$@" set_fact_cached_1.yml +ansible-playbook -i inventory "$@" set_fact_cached_2.yml +ansible-playbook -i inventory --flush-cache "$@" set_fact_no_cache.yml # Test boolean conversions in set_fact ansible-playbook -v set_fact_bool_conv.yml