From 87f2e362b35e7cd44a12a887dbb78ea35274f697 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 20 Feb 2014 16:10:44 -0500 Subject: [PATCH] Adding new test for always_run option in check mode --- tests_new/integration/Makefile | 5 +++- tests_new/integration/check_mode.yml | 3 ++ .../roles/test_always_run/meta/main.yml | 18 ++++++++++++ .../roles/test_always_run/tasks/main.yml | 29 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tests_new/integration/check_mode.yml create mode 100644 tests_new/integration/roles/test_always_run/meta/main.yml create mode 100644 tests_new/integration/roles/test_always_run/tasks/main.yml diff --git a/tests_new/integration/Makefile b/tests_new/integration/Makefile index f28d6576dce..a169aa9dd15 100644 --- a/tests_new/integration/Makefile +++ b/tests_new/integration/Makefile @@ -1,4 +1,4 @@ -all: non_destructive destructive test_hash # amazon rackspace +all: non_destructive destructive check_mode test_hash # amazon rackspace non_destructive: ansible-playbook non_destructive.yml -i inventory -e @integration_config.yml -v $(TEST_FLAGS) @@ -6,6 +6,9 @@ non_destructive: destructive: ansible-playbook destructive.yml -i inventory -e @integration_config.yml -v $(TEST_FLAGS) +check_mode: + ansible-playbook check_mode.yml -i inventory -e @integration_config.yml -v --check $(TEST_FLAGS) + test_hash: ANSIBLE_HASH_BEHAVIOUR=replace ansible-playbook test_hash.yml -i inventory -v -e '{"test_hash":{"extra_args":"this is an extra arg"}}' ANSIBLE_HASH_BEHAVIOUR=merge ansible-playbook test_hash.yml -i inventory -v -e '{"test_hash":{"extra_args":"this is an extra arg"}}' diff --git a/tests_new/integration/check_mode.yml b/tests_new/integration/check_mode.yml new file mode 100644 index 00000000000..f2679699e0a --- /dev/null +++ b/tests_new/integration/check_mode.yml @@ -0,0 +1,3 @@ +- hosts: testhost + roles: + - { role: test_always_run, tags: test_always_run } diff --git a/tests_new/integration/roles/test_always_run/meta/main.yml b/tests_new/integration/roles/test_always_run/meta/main.yml new file mode 100644 index 00000000000..b7cb12f7b61 --- /dev/null +++ b/tests_new/integration/roles/test_always_run/meta/main.yml @@ -0,0 +1,18 @@ +# test code for the always_run option +# (c) 2014, James Cammarata + +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + diff --git a/tests_new/integration/roles/test_always_run/tasks/main.yml b/tests_new/integration/roles/test_always_run/tasks/main.yml new file mode 100644 index 00000000000..036a6b98606 --- /dev/null +++ b/tests_new/integration/roles/test_always_run/tasks/main.yml @@ -0,0 +1,29 @@ +# test code for the always_run option +# (c) 2014, James Cammarata + +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +- name: run a command while in check mode + shell: echo "running" + always_run: yes + register: result + +- name: assert that the command was run + assert: + that: + - "result.changed == true" + - "result.stdout == 'running'" + - "result.rc == 0"