From 3e5e7dabc8420b8ca4f19c3b37e08d5a41a462fb Mon Sep 17 00:00:00 2001
From: LegenJCdary <jay_cob@interia.pl>
Date: Thu, 16 Feb 2023 15:28:28 +0100
Subject: [PATCH] Adjust 02a tests to new error output format

---
 tests/02a-checkrun.sh       |  7 +++----
 tests/02a-checkrun_short.sh |  7 +++----
 tests/testing_lib.sh        | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/tests/02a-checkrun.sh b/tests/02a-checkrun.sh
index 27b2be84..eb7ad4c4 100755
--- a/tests/02a-checkrun.sh
+++ b/tests/02a-checkrun.sh
@@ -63,10 +63,9 @@ echo -e "   ___ ____                      _               _\n  / _ \___ \ __ _
 check_run_ok "ansible-deployer show --debug" "\[DEBUG\]: load_configuration called"
 
 # Check different output options
-check_message_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra" "\[ERROR\]: TASK \[Run ll\]"
-check_message_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra --debug" "\[DEBUG\]: TASK \[Run ll\]"
-check_message_not_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra --raw-runner-output" "\[ERROR\]: TASK \[Run ll\]"
-check_message_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra --raw-runner-output --debug" "\[DEBUG\]: TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra" "\[ERROR\]:.*\n.*TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra --raw-runner-output" "\[ERROR\]:.*\n.*TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run --task task_with_ansible_fail --stage testing --infrastructure testInfra --raw-runner-output" ".*\n.*TASK \[Run ll\]"
 
 echo -e "   ___ ____                      _               _\n  / _ \___ \ __ _            ___| |__   ___  ___| | ___ __ _   _ _ __\n | | | |__) / _\` |  _____   / __| '_ \ / _ \/ __| |/ / '__| | | | '_ \ \n | |_| / __/ (_| | |_____| | (__| | | |  __/ (__|   <| |  | |_| | | | |\n  \___/_____\__,_|          \___|_| |_|\___|\___|_|\_\_|   \__,_|_| |_|\n \n  _ _           _ _                 _   _\n | (_)_ __ ___ (_) |_    ___  _ __ | |_(_) ___  _ __\n | | | '_ \` _ \| | __|  / _ \| '_ \| __| |/ _ \| '_ \ \n | | | | | | | | | |_  | (_) | |_) | |_| | (_) | | | |\n |_|_|_| |_| |_|_|\__|  \___/| .__/ \__|_|\___/|_| |_|\n                             |_|\n"
 # Check --limit option
diff --git a/tests/02a-checkrun_short.sh b/tests/02a-checkrun_short.sh
index 2b715a49..4bdadde7 100755
--- a/tests/02a-checkrun_short.sh
+++ b/tests/02a-checkrun_short.sh
@@ -62,10 +62,9 @@ echo -e "   ___ ____                      _               _
 check_run_ok "ansible-deployer show -d" "\[DEBUG\]: load_configuration called"
 
 # Check different output options
-check_message_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra" "\[ERROR\]: TASK \[Run ll\]"
-check_message_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra -d" "\[DEBUG\]: TASK \[Run ll\]"
-check_message_not_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra --raw-runner-output" "\[ERROR\]: TASK \[Run ll\]"
-check_message_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra --raw-runner-output -d" "\[DEBUG\]: TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra" "\[ERROR\]:.*\n.*TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra --raw-runner-output" "\[ERROR\]:.*\n.*TASK \[Run ll\]"
+check_message_with_newline_in_output "ansible-deployer run -t task_with_ansible_fail -s testing -i testInfra --raw-runner-output" ".*\n.*TASK \[Run ll\]"
 
 echo -e "   ___ ____                      _               _                           _                _\n  / _ \___ \ __ _            ___| |__   ___  ___| | ___ __ _   _ _ __    ___| |__   ___  _ __| |_\n | | | |__) / _\` |  _____   / __| '_ \ / _ \/ __| |/ / '__| | | | '_ \  / __| '_ \ / _ \| '__| __|\n | |_| / __/ (_| | |_____| | (__| | | |  __/ (__|   <| |  | |_| | | | | \__ \ | | | (_) | |  | |_\n  \___/_____\__,_|          \___|_| |_|\___|\___|_|\_\_|   \__,_|_| |_| |___/_| |_|\___/|_|   \__|\n \n  _ _           _ _                 _   _\n | (_)_ __ ___ (_) |_    ___  _ __ | |_(_) ___  _ __\n | | | '_ \` _ \| | __|  / _ \| '_ \| __| |/ _ \| '_ \ \n | | | | | | | | | |_  | (_) | |_) | |_| | (_) | | | |\n |_|_|_| |_| |_|_|\__|  \___/| .__/ \__|_|\___/|_| |_|\n                             |_|\n"
 # Check --limit option
diff --git a/tests/testing_lib.sh b/tests/testing_lib.sh
index 2c8a7fe7..a3da91e2 100644
--- a/tests/testing_lib.sh
+++ b/tests/testing_lib.sh
@@ -72,3 +72,35 @@ check_file_startingwith_in_dir() {
 		exit 1
 	fi
 }
+
+check_message_with_newline_in_output() {
+        CMD=$1
+        EXPTEXT=$2
+        echo "Check: $CMD"
+        eval "$CMD |& grep -zP '$EXPTEXT'"
+        if [ $? -eq 0 ]
+        then
+                echo "OK: '${CMD}' returned '${EXPTEXT}'"
+        else
+                echo "FAILED: '${CMD}' didn't return '${EXPTEXT}'"
+		echo $CMD
+		eval $CMD
+                exit 1
+        fi
+}
+
+check_message_with_newline_not_in_output() {
+        CMD=$1
+        EXPTEXT=$2
+        echo "Check: $CMD"
+        eval "$CMD |& grep -zP '$EXPTEXT'"
+        if [ $? -eq 0 ]
+        then
+                echo "FAILED: '${CMD}' returned '${EXPTEXT}'"
+		echo $CMD
+		eval $CMD
+                exit 1
+        else
+                echo "OK: '${CMD}' didn't return '${EXPTEXT}'"
+        fi
+}