X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=78f27fd2662d8ada23188d7d5d2cf334906a5b54;hb=8fbc63697f2edaaf2c9db40f54b318e7211361e2;hp=1c77edab456fe51ed2ae90b9defe5fb66e7d0c71;hpb=145762b23535cdffece56c661d9fc0c073cc911e;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 1c77edab..78f27fd2 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -1117,7 +1117,7 @@ if [ $RUNMODE == "DOCKER" ]; then
 		echo -e $RED"docker-compose is required to run the test environment, pls install"$ERED
 		exit 1
 	else
-		tmp=$(docker-compose version --short)
+		tmp=$(docker-compose version)
 		echo " docker-compose installed and using version $tmp"
 		if [[ "$tmp" == *'v2'* ]]; then
 			DOCKER_COMPOSE_VERION="V2"
@@ -2360,7 +2360,7 @@ __kube_delete_all_resources() {
 			ns_flag=""
 			ns_text=""
 		fi
-		result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}')
+		result=$(kubectl $KUBECONF get $restype $ns_flag -o jsonpath='{.items[?(@.metadata.labels.'$labelname'=="'$labelid'")].metadata.name}' 2> /dev/null)
 		if [ $? -eq 0 ] && [ ! -z "$result" ]; then
 			deleted_resourcetypes=$deleted_resourcetypes" "$restype
 			for resid in $result; do