Merge pull request #20 from ansiblebit/steenzout-ansible-2.0

ansible 2.0 tests and check mode tests

Author: steenzout

tasks/check_environment.yml

@@ -16,21 +16,20 @@
 # oracle_java_installed.rc == 0 : installed
 # oracle_java_installed.rc == 1 : not installed
 
-- name: echo oracle_java_task_installed
-  debug:
-    msg="oracle_java_task_installed={{ oracle_java_task_installed }}"
+- debug:
+    var=oracle_java_task_installed
   when: oracle_java_task_installed is defined
   tags:
     - debug
 
 - name: set fact oracle_java_installed
   set_fact:
     oracle_java_installed={{ oracle_java_task_installed.rc == 0 }}
+  when: oracle_java_task_installed is defined and oracle_java_task_installed.rc is defined
   changed_when: False
 
-- name: echo oracle_java_installed
-  debug:
-    msg="oracle_java_installed={{ oracle_java_installed }}"
+- debug:
+    var=oracle_java_installed
   when: oracle_java_installed is defined
   tags:
     - debug
@@ -40,33 +39,30 @@
 
 - name: if Java is installed, check version
   shell: java -version 2>&1 | head -n 1 | awk '{ print $3 }' | awk -F '"' '{ print $2 }'
-  when: oracle_java_installed
+  when: oracle_java_installed is defined
   register: oracle_java_task_version
   changed_when: False
 
-- name: echo oracle_java_task_version
-  debug:
-    msg="oracle_java_task_version={{ oracle_java_task_version }}"
+- debug:
+    var=oracle_java_task_version
   when: oracle_java_task_version is defined
   tags:
     - debug
 
 - name: set fact oracle_java_installed_version
   set_fact:
     oracle_java_version_installed={{ oracle_java_task_version.stdout }}
-  when: oracle_java_installed
+  when: oracle_java_task_version is defined and oracle_java_task_version.stdout is defined
   changed_when: False
 
-- name: echo oracle_java_version_installed
-  debug:
-    msg="oracle_java_version_installed={{ oracle_java_version_installed }}"
+- debug:
+    var=oracle_java_version_installed
   when: oracle_java_version_installed is defined
   tags:
     - debug
 
-- name: echo oracle_java_version_string
-  debug:
-    msg="oracle_java_version_string={{ oracle_java_version_string }}"
+- debug:
+    var=oracle_java_version_string
   when: oracle_java_version_string is defined
   tags:
     - debug

tox.ini

@@ -1,18 +1,18 @@
 [tox]
 envlist =
-    {py27}-{ansible2002,ansible194}
+    {py27}-{ansible2010,ansible194}
 
 skipsdist = True
 
 
 [testenv]
 changedir = tests
 deps =
-    travis: ansible==1.9.4
-    ansible2002: ansible==2.0.0.2
+    travis: ansible
+    ansible2010: ansible==2.0.1.0
     ansible194: ansible==1.9.4
 
-passenv = ANSIBLE_ASK_SUDO_PASS HOME
+passenv = ANSIBLE_ASK_SUDO_PASS HOME LANG LC_ALL
 
 commands =
     bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml || true"
@@ -27,19 +27,11 @@ passenv = ANSIBLE_ASK_SUDO_PASS HOME TRAVIS
 
 commands =
     bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml || true"
-    ansible-playbook -i localhost, --connection=local test.yml {posargs} --skip-tags=test
+    ansible-playbook -i localhost, --connection=local test.yml -e vagrant_box=localhost {posargs} --skip-tags=test
+    bash test_checkmode.sh --env travis
     bash test_idempotence.sh --env travis
 
 whitelist_externals =
     ansible-playbook
     bash
 
-
-[testenv:docs]
-# sphinx documentation checks
-changedir = docs
-deps =
-    Sphinx
-
-commands =
-    sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html