diff mbox series

[07/21] tests/lib.sh: Fix check if array is defined

Message ID	20240520090611.10406-8-jonatan.schlag@ipfire.org
State	New
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 07/21] tests/lib.sh: Fix check if array is defined Date: Mon, 20 May 2024 11:05:57 +0200 Message-Id: <20240520090611.10406-8-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: VOE6M2VS6PGXVGDCAXHCAGMYA4PG6MM5 Precedence: list Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/VOE6M2VS6PGXVGDCAXHCAGMYA4PG6MM5/>
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 May 20, 2024, 9:05 a.m. UTC

  -v does a bad job here. We need to use declare here.

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

Comments

Michael Tremer May 31, 2024, 9:51 a.m. UTC | #1

> On 20 May 2024, at 10:05, Jonatan Schlag <jonatan.schlag@ipfire.org> wrote:
> 
> -v does a bad job here. We need to use declare here.
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
> tests/lib.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/lib.sh b/tests/lib.sh
> index 079755410..0f4de8e43 100644
> --- a/tests/lib.sh
> +++ b/tests/lib.sh
> @@ -29,10 +29,11 @@ var_has_value() {
> 
> test_that_key_in_arry_has_value() {
> local array="${!1}"
> + local arrayname="${1}"
> local key="${2}"
> local value="${3}"
> 
> - if [[ ! -v "${array}" ]]; then
> + if [[ ! "$(declare  -p "${arrayname}")" =~ "declare -a" && ! "$(declare  -p "${arrayname}")" =~ "declare -A" ]]; then
> log_test_failed "The array '${1}' does not exists. The variable is not set."
> return 1

Please comment code like this. It is hard to read and not obvious to understand.

> fi
> -- 
> 2.39.2
>

diff mbox series

Patch

diff --git a/tests/lib.sh b/tests/lib.sh
index 079755410..0f4de8e43 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -29,10 +29,11 @@  var_has_value() {
 
 test_that_key_in_arry_has_value() {
 	local array="${!1}"
+	local arrayname="${1}"
 	local key="${2}"
 	local value="${3}"
 
-	if [[ ! -v "${array}" ]]; then
+	if [[ ! "$(declare  -p "${arrayname}")" =~ "declare -a" && ! "$(declare  -p "${arrayname}")" =~ "declare -A" ]]; then
 		log_test_failed "The array '${1}' does not exists. The variable is not set."
 		return 1
 	fi