Add tests for better hook output

.circleci/config.yml

@@ -36,6 +36,24 @@ jobs:
             ./tests/01-test_argument_parsing.sh
             ./tests/02-checkrun.sh
             ./tests/05-permission_checks.sh
+      - run:
+          name: "Copy failing hooks"
+          command: cp ./tests/files/etc/hooks/* /etc/ansible-deploy/hooks
+      - run:
+          name: "Run shell script for error returning hook"
+          command: |
+            cp ./tests/files/etc/tasks_error_hook.yaml /etc/ansible-deploy/tasks.yaml
+            ./tests/04-error_hook.sh
+      - run:
+          name: "Run shell script for error returning hook with exit"
+          command: |
+            cp ./tests/files/etc/tasks_exit_hook.yaml /etc/ansible-deploy/tasks.yaml
+            ./tests/04-exit_hook.sh
+      - run:
+          name: "Run shell script for critical returning hook"
+          command: |
+            chmod 0644 /etc/ansible-deploy/hooks/exit_hook.sh
+            ./tests/04-critical_hook.sh
       - run:
           name: "Create incompatible config file"
           command: cp ./tests/files/incompatible_config.yml /etc/ansible-deploy

etc/hooks/setup_work_dir.sh

@@ -49,3 +49,4 @@ cat << END > ./prod_infra3_inv.yaml
 localhost
 END
 
+echo "setup_work_dir finished succesfully"

tests/02-checkrun.sh

@@ -39,6 +39,7 @@ check_message_in_output "ansible-deployer run -t task_with_commit -s testing -i
 echo -e "   ___ ____                                     _   _\n  / _ \___ \            _____  _____  ___ _   _| |_(_) ___  _ __\n | | | |__) |  _____   / _ \ \/ / _ \/ __| | | | __| |/ _ \| '_ \ \n | |_| / __/  |_____| |  __/>  <  __/ (__| |_| | |_| | (_) | | | |\n  \___/_____|          \___/_/\_\___|\___|\__,_|\__|_|\___/|_| |_|\n \n        _   _\n   ___ | |_| |__   ___ _ __ ___\n  / _ \| __| '_ \ / _ \ '__/ __|\n | (_) | |_| | | |  __/ |  \__ \\n  \___/ \__|_| |_|\___|_|  |___/\n \n"
 # misc
 check_message_in_output 'ansible-deployer run -t task_empty -s testing -i testInfra' '\[CRITICAL\]: No playbooks found for requested task'
+check_message_in_output 'ansible-deployer run -t task_exec_bin_true -s prod -i testInfra' '\[INFO\]: setup_work_dir finished succesfully'
 
 #Artificially generate lock
 check_run_ok "ansible-deployer lock -s locked -i testInfra"

tests/04-critical_hook.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -l
+
+
+source ./tests/testing_lib.sh
+
+check_message_in_output 'ansible-deployer run -t task_exec_bin_true -s prod -i testInfra' '\[CRITICAL\]: Failed executing /etc/ansible-deploy/hooks/exit_hook.sh'

tests/04-error_hook.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -l
+
+
+source ./tests/testing_lib.sh
+
+check_message_in_output 'ansible-deployer run -t task_exec_bin_true -s prod -i testInfra' '\[ERROR\]: /etc/ansible-deploy/hooks/error_hook.sh: line 3: dos2uni: command not found'
+check_run_ok 'ansible-deployer run -t task_exec_bin_true -s prod -i testInfra' 

tests/04-exit_hook.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -l
+
+
+source ./tests/testing_lib.sh
+
+check_message_in_output 'ansible-deployer run -t task_exec_bin_true -s prod -i testInfra' '\[CRITICAL\]: Setup hook exit_hook failed, cannot continue'

tests/files/etc/hooks/error_hook.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -l
+
+dos2uni /etc/ansible-deploy/ansible-deploy.yaml
+
+ls -l /etc/ansible-deploy/ansible-deploy.yaml

tests/files/etc/hooks/exit_hook.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -l
+
+dos2uni /etc/ansible-deploy/ansible-deploy.yaml
+ls -l /etc/ansible-deploy/ansible-deploy.yaml
+
+exit 1

tests/files/etc/tasks_error_hook.yaml

@@ -0,0 +1,36 @@
+setup_hooks:
+  - name: setup_ansible
+    module: script
+    opts:
+      file: /etc/ansible-deploy/hooks/setup_work_dir.sh
+  - name: error_hook
+    module: script
+    opts:
+      file: /etc/ansible-deploy/hooks/error_hook.sh
+
+play_items:
+  - name: run_bin_true
+    file: runBinTrue.yaml
+
+tasks:
+  - name: task_exec_bin_true
+    play_items:
+      - run_bin_true
+    allowed_for:
+      - group: test_group
+        infra:
+          - name: testInfra
+            stages:
+              - testing
+        commit:
+          - test_version
+      - group: root
+        infra:
+          - name: testInfra
+            stages:
+              - testing
+              - prod
+              - locked
+        commit:
+          - test_version
+    allow_limit: False

tests/files/etc/tasks_exit_hook.yaml

@@ -0,0 +1,36 @@
+setup_hooks:
+  - name: setup_ansible
+    module: script
+    opts:
+      file: /etc/ansible-deploy/hooks/setup_work_dir.sh
+  - name: exit_hook
+    module: script
+    opts:
+      file: /etc/ansible-deploy/hooks/exit_hook.sh
+
+play_items:
+  - name: run_bin_true
+    file: runBinTrue.yaml
+
+tasks:
+  - name: task_exec_bin_true
+    play_items:
+      - run_bin_true
+    allowed_for:
+      - group: test_group
+        infra:
+          - name: testInfra
+            stages:
+              - testing
+        commit:
+          - test_version
+      - group: root
+        infra:
+          - name: testInfra
+            stages:
+              - testing
+              - prod
+              - locked
+        commit:
+          - test_version
+    allow_limit: False