From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 04/18] tests/lib.sh: Add logging functions
Date: Sun, 16 Jun 2024 18:02:31 +0200
Message-ID: <20240616160245.18865-5-jonatan.schlag@ipfire.org>
In-Reply-To: <20240616160245.18865-1-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2540578131436929348=="
List-Id: <development.lists.ipfire.org>

--===============2540578131436929348==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

So we can change the style of our log messages better.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 tests/lib.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/lib.sh b/tests/lib.sh
index 4fce151f8..e462f4add 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -11,13 +11,21 @@ LIB_DIR=3D"$(dirname "${LIB_DIR}")"
=20
 . ${LIB_DIR}/lib_color.sh
=20
+log_test_failed(){
+	echo -e "${CLR_RED_BG}Test failed: ${*}${CLR_RESET}'"
+}
+
+log_test_succeded(){
+	echo -e "${CLR_GREEN_BG}Test succeded: ${*}${CLR_RESET}"
+}
+
 test_command() {
=20
 	if ! "$@" ; then
-		echo -e "${CLR_RED_BG} Test failed: ${*} ${CLR_RESET}"
+		log_test_failed "${*}"
 		return 1
 	else
-		echo -e "${CLR_GREEN_BG} Test succeded: ${*} ${CLR_RESET}"
+		log_test_succeded "${*}"
 		return 0
 	fi
 }
@@ -36,15 +44,15 @@ test_value_in_array() {
 	# If the array was not declared as indexed or associative array we fail. We=
 cannot check for a value in an array if=20
 	# we were not given array.
 	if [[ ! "$(declare  -p "${arrayname}")" =3D~ "declare -a" && ! "$(declare  =
-p "${arrayname}")" =3D~ "declare -A" ]]; then
-		echo -e "${CLR_RED_BG}Test failed: The array '${1}' does not exists. The v=
ariable is not set.${CLR_RESET}'"
+		log_test_failed "The array '${1}' does not exists. The variable is not set=
."
 		return 1
 	fi
=20
 	if [[ "${array[${key}]}" =3D=3D "${value}" ]] ; then
-		echo -e "${CLR_GREEN_BG}Test succeded: The array '${1}' contains the value=
 '${value}' under the key '${key}' ${CLR_RESET}"
+		log_test_succeded "The array '${1}' contains the value '${value}' under th=
e key '${key}'"
 		return 0
 	else
-		echo -e "${CLR_RED_BG}Test failed: The array '${1}' contains the value '${=
array[${key}]}' under the key '${key} and not '${value}' ${CLR_RESET}"
+		log_test_failed "The array '${1}' contains the value '${array[${key}]}' un=
der the key '${key} and not '${value}'"
 		return 1
 	fi
 }
--=20
2.39.2


--===============2540578131436929348==--