From 41349f4ee49ed3d997d89beb4bf4748c03c13896 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 7 Jul 2023 18:31:22 +0200 Subject: [PATCH 1/2] test/system: Silence SC1090 Otherwise https://www.shellcheck.net/ would complain: Line 218: source <(echo "$output") ^---------------^ SC1090 (warning): ShellCheck can't follow non-constant source. Use a directive to specify location. See: https://www.shellcheck.net/wiki/SC1090 https://github.com/containers/toolbox/pull/1347 --- test/system/104-run.bats | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/system/104-run.bats b/test/system/104-run.bats index 117789657..035917c99 100644 --- a/test/system/104-run.bats +++ b/test/system/104-run.bats @@ -211,6 +211,7 @@ teardown() { assert [ ${#lines[@]} -gt 0 ] assert [ ${#stderr_lines[@]} -eq 0 ] + # shellcheck disable=SC1090 source <(echo "$output") run echo "$name" @@ -234,6 +235,7 @@ teardown() { assert [ ${#lines[@]} -gt 0 ] assert [ ${#stderr_lines[@]} -eq 0 ] + # shellcheck disable=SC1090 source <(echo "$output") run echo "$name" From a055e78d429c04c86f05d4e014760b05be547891 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 14 Jul 2023 07:25:00 +0200 Subject: [PATCH 2/2] test/system: Silence SC2004 Otherwise https://www.shellcheck.net/ would complain Line 110: for ((i = ${num_of_retries}; i > 0; i--)); do ^---------------^ SC2004 (style): $/${} is unnecessary on arithmetic variables. See: https://www.shellcheck.net/wiki/SC2004 https://github.com/containers/toolbox/pull/1347 --- test/system/libs/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash index a905b351d..9ee702264 100644 --- a/test/system/libs/helpers.bash +++ b/test/system/libs/helpers.bash @@ -107,7 +107,7 @@ function _pull_and_cache_distro_image() { assert_success fi - for ((i = ${num_of_retries}; i > 0; i--)); do + for ((i = num_of_retries; i > 0; i--)); do run $SKOPEO copy --dest-compress docker://${image} dir:${IMAGE_CACHE_DIR}/${image_archive} if [ "$status" -eq 0 ]; then