Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Test case updates
[nonrtric.git]
/
test
/
common
/
testcase_common.sh
diff --git
a/test/common/testcase_common.sh
b/test/common/testcase_common.sh
index
1c77eda
..
78f27fd
100755
(executable)
--- 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
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"
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
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
if [ $? -eq 0 ] && [ ! -z "$result" ]; then
deleted_resourcetypes=$deleted_resourcetypes" "$restype
for resid in $result; do