Merge pull request #116 from ansiblebit/develop

test improvements

Author: steenzout

.yamllint.yml

@@ -0,0 +1,21 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines: {type: unix}
+  trailing-spaces: disable
+  truthy: disable

tasks/check_environment.yml

@@ -7,7 +7,7 @@
 #
 
 - name: determine if Java is already installed
-  shell: which java
+  command: which java
   register: oracle_java_task_installed
   changed_when: oracle_java_task_installed.rc != 0
   failed_when: no
@@ -19,7 +19,12 @@
     oracle_java_installed={{ not oracle_java_task_installed.changed }}
 
 - name: determine which Java version is installed
-  shell: java -version 2>&1 | head -n 1 | awk '{ print $3 }' | awk -F '"' '{ print $2 }'
+  shell: |
+    set -o pipefail |
+    java -version 2>&1 |
+    head -n 1 |
+    awk '{ print $3 }' |
+    awk -F '"' '{ print $2 }'
   register: oracle_java_task_version
   when: oracle_java_installed
   changed_when: False

tasks/darwin/macosx.yml

@@ -19,26 +19,26 @@
   tags:
     - installation
 
-- name: mount DMG image
-  shell: echo TODO
-  tags:
-    - installation
+# - name: mount DMG image
+#   shell: echo TODO
+#   tags:
+#     - installation
 
-- name: install JDK
-  shell: echo TODO
-  tags:
-    - installation
+# - name: install JDK
+#   shell: echo TODO
+#   tags:
+#     - installation
 
-- name: unmount DMG image
-  shell: echo TODO
-  tags:
-    - installation
+# - name: unmount DMG image
+#   shell: echo TODO
+#   tags:
+#     - installation
 
-- name: set Java version as default
-  shell: echo TODO
-  when: oracle_java_set_as_default
-  register: oracle_java_task_set_default
-  become: yes
+# - name: set Java version as default
+#   shell: echo TODO
+#   when: oracle_java_set_as_default
+#   register: oracle_java_task_set_default
+#   become: yes
 
 - name: in case there were changes, check host environment again
   include: ../check_environment.yml

tasks/installation/debian/main.yml

@@ -39,7 +39,7 @@
 - name: debian | set Java version as default
   apt:
     name="{{ oracle_java_debconf_package_default }}"
-    state=latest
+    state=present
   register: oracle_java_task_set_default
   when: oracle_java_set_as_default
   become: yes

tests/tasks/main.yml

@@ -41,4 +41,3 @@
     - keytool
     - java
     - javadoc
-

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36}-ansible{27,26,25},py27-{24,23,22,21,20}
+    py{36}-ansible{28,27,26,25},py27-{24,23,22,21,20}
 
 skipsdist = True
 
@@ -17,10 +17,14 @@ deps =
     ansible22: ansible>=2.2,<2.3
     ansible21: ansible>=2.1,<2.2
     ansible20: ansible>=2.0.0,<2.1
+    ansible-lint==4.1.0
+    yamllint==1.15.0
 
 passenv = ANSIBLE_ASK_SUDO_PASS HOME LANG LC_ALL TRAVIS USER
 
 commands =
+    yamllint -c ../.yamllint.yml ..
+    ansible-lint --exclude .tox ..
     bash setup.sh
     bash travis.sh {posargs}
     bash vagrant.sh {posargs}