Add ability for playbooks to skip checking the results

If "SKIPPED" file found in the testing dir after running first ansible-playbook, run.sh skips checking that test.
yaegashi · Apr 29, 2015 · 45c9484 · 45c9484
1 parent 405c100
commit 45c9484
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/tests/run.sh b/tests/run.sh
@@ -13,10 +13,17 @@ run() {
         testing_dir="$PWD/testing/$base"
         expected_dir="$PWD/expected/$base"
         idlog="$PWD/testing/$base-id.log"
+        skipped="$testing_dir/SKIPPED"
         echo "$p: Running ansible-playbook"
         if ! ansible-playbook -v -i hosts -e testing_dir=$testing_dir $p; then
-                echo "$p: ansible-playbook failed"
-                exit 1
+                echo -n "$p: "
+                if test -e $skipped; then
+                        cat $skipped
+                        exit 2
+                else
+                        echo "ansible-playbook failed"
+                        exit 1
+                fi
         fi
         echo "$p: Running ansible-playbook again"
         ansible-playbook -v -i hosts -e testing_dir=$testing_dir $p | tee $idlog
@@ -40,6 +47,8 @@ for i in $tests; do
         echo "$i: Starting..."
         if ( run $i ); then
                 echo "$i: Passed"
+        elif test $? = 2; then
+                echo "$i: Skipped"
         else
                 echo "$i: Failed"
                 code=1

diff --git a/tests/test-follow.yml b/tests/test-follow.yml
@@ -4,6 +4,9 @@
   roles:
     - ../..
   tasks:
+    - shell: echo "Detected Ansible prior to 1.8" > {{testing_dir}}/SKIPPED
+             && false
+      when: ansible_version is not defined
     - name: update symlink file without follow
       blockinfile: |
         dest={{testing_dir}}/link0.txt backup=yes follow=no