iSulad/0099-remove-health-check-abnormal-test_cases.patch
openeuler-sync-bot bfbf786760 !596 [sync] PR-594: upgrade from upstream
* upgrade from upstream
2023-08-15 12:28:02 +00:00

78 lines
3.1 KiB
Diff

From f5e249b6733a88e3ac8872fd5013e418f902683f Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Fri, 28 Jul 2023 16:40:09 +1400
Subject: [PATCH 04/11] remove health check abnormal test_cases
Signed-off-by: zhongtao <zhongtao17@huawei.com>
---
CI/test_cases/container_cases/health_check.sh | 46 -------------------
1 file changed, 46 deletions(-)
diff --git a/CI/test_cases/container_cases/health_check.sh b/CI/test_cases/container_cases/health_check.sh
index 5e6b5641..4971ff05 100755
--- a/CI/test_cases/container_cases/health_check.sh
+++ b/CI/test_cases/container_cases/health_check.sh
@@ -241,50 +241,6 @@ function test_health_check_monitor()
return ${ret}
}
-function test_health_check_abnormal()
-{
- local ret=0
- local image="busybox"
- local retry_limit=10
- local retry_interval=1
- local test="health check abnormal => (${FUNCNAME[@]})"
-
- msg_info "${test} starting..."
-
- isula images | grep ${image}
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - missing list image: ${image}" && ((ret++))
-
- container_name="health_check_abnormal"
- isula run -itd --runtime $1 -n ${container_name} --health-cmd="sleep 999" --health-timeout=1000000s --health-retries=1 ${image} /bin/sh
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to run container with image: ${image}" && ((ret++))
-
- do_retry ${retry_limit} ${retry_interval} inspect_container_status ${container_name} running
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container status: not running" && ((ret++))
-
- # Health check has been performed yet
- do_retry ${retry_limit} ${retry_interval} inspect_container_health_status ${container_name} starting
- # Initial status when the container is still starting
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container health check status: not starting" && ((ret++))
-
- sleep 30 # wait health check exec
-
- isula stop -t 0 ${container_name} &
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to stop container: ${container_name}" && ((ret++))
-
- do_retry ${retry_limit} ${retry_interval} inspect_container_status ${container_name} exited
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container status: not exited" && ((ret++))
-
- do_retry ${retry_limit} ${retry_interval} inspect_container_health_status ${container_name} unhealthy
- # The container process exits and the health check status becomes unhealthy
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container health check status: not unhealthy" && ((ret++))
-
- isula rm -f ${container_name}
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to remove container: ${container_name}" && ((ret++))
-
- msg_info "${test} finished with return ${ret}..."
- return ${ret}
-}
-
declare -i ans=0
for element in ${RUNTIME_LIST[@]};
@@ -300,8 +256,6 @@ do
test_health_check_monitor $element || ((ans++))
- test_health_check_abnormal $element || ((ans++))
-
msg_info "${test} finished with return ${ans}..."
done
--
2.25.1