diff mbox series

[05/21] tests/lib.sh: Add logging functions

Message ID	20240520090611.10406-6-jonatan.schlag@ipfire.org
State	New
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 05/21] tests/lib.sh: Add logging functions Date: Mon, 20 May 2024 11:05:55 +0200 Message-Id: <20240520090611.10406-6-jonatan.schlag@ipfire.org> In-Reply-To: <20240520090611.10406-1-jonatan.schlag@ipfire.org> References: <20240520090611.10406-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TSCJNDTTSFRBBQXRV5TO4BEOWFXYTKST Precedence: list Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/TSCJNDTTSFRBBQXRV5TO4BEOWFXYTKST/>
Series	[01/21] test: Add bash lib for colors \| [01/21] test: Add bash lib for colors [02/21] tests: Add bash lib [03/21] tests/lib.sh: Add function test_that_key_in_arry_has_value [04/21] tests/lib.sh: Add check if variable exists to test_that_key_in_arry_has_value [05/21] tests/lib.sh: Add logging functions [06/21] tests/lib.sh: adjust to pytest logging style [07/21] tests/lib.sh: Fix check if array is defined [08/21] test_that_key_in_arry_has_value: Check if the key is defined [09/21] tests/lib.sh: Use namref to access an array [10/21] test_that_key_in_arry_has_value: Check if a key in an array exists [11/21] tests: Add function to test the ouput of a bash function [12/21] initscript functions: add readhash [13/21] initscript fkt: ignore blank lines in readhash [14/21] test: Add functions test_that_array_is_defined [15/21] tests: Add functions test_that_array_doesnt_have_key [16/21] initscripts fkt: Ignore comments in readhash [17/21] initscripts fkt: ignore invalid keys in readhash [18/21] initscripts fkt: readhash should only parse lines with a = [19/21] initscripts fkt: Check for invalid values in readhash [20/21] initscripts fkt: keep readhash compatible with older implementation [21/21] initscripts fkt: Fix shebang

Commit Message

Jonatan Schlag 20 May 2024, 9:05 a.m. UTC

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

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

diff mbox series

Patch

diff --git a/tests/lib.sh b/tests/lib.sh
index 373b7c3a0..6483c41c3 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -4,13 +4,21 @@  LIB_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 . ${LIB_DIR}/lib_color.sh
 
+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_that() {
 
 	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
 }
@@ -25,15 +33,15 @@  test_that_key_in_arry_has_value() {
 	local value="${3}"
 
 	if [[ ! -v "${array}" ]]; then
-		echo -e "${CLR_RED_BG}Test failed: The array '${1}' does not exists. The variable is not set.${CLR_RESET}'"
+		log_test_failed "The array '${1}' does not exists. The variable is not set."
 		return 1
 	fi
 
 	if [[ "${array[${key}]}" == "${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 the 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}]}' under the key '${key} and not '${value}'"
 		return 1
 	fi
 }