diff --git a/component/ascend-device-plugin/build/test.sh b/component/ascend-device-plugin/build/test.sh index 03d67c831d367d0fd2424f1e101b66cdf7814c8b..191a312a1a1e7d81da7b7c7db8fc258d53a11491 100644 --- a/component/ascend-device-plugin/build/test.sh +++ b/component/ascend-device-plugin/build/test.sh @@ -37,9 +37,9 @@ function execute_test() { coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + echo "coverage passed: $total_coverage%" else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/ascend-device-plugin/pkg/device/ascend910_test.go b/component/ascend-device-plugin/pkg/device/ascend910_test.go index dbf1c4d3b0bb82dece8d992ca64dd52eb364ee24..0788c7d80c5bb04796787b0fc01648da0f1bab11 100644 --- a/component/ascend-device-plugin/pkg/device/ascend910_test.go +++ b/component/ascend-device-plugin/pkg/device/ascend910_test.go @@ -62,6 +62,7 @@ const ( ) var ascend910testErr = errors.New("test") +var mockErr = errors.New("mock error") func createFake910Manager() *HwAscend910Manager { manager := NewHwAscend910Manager() @@ -1991,7 +1992,7 @@ func TestRestartRequestProcess(t *testing.T) { taskName := "mockTaskName" resetInfo := &common.TaskResetInfo{RankList: mockTaskDevInfoList()} convey.Convey("test restartRequestProcess", t, func() { - mockFunc := mockUpdateResetCMStatus(errors.New("mock error")). + mockFunc := mockUpdateResetCMStatus(mockErr). ApplyFuncReturn(time.Sleep).ApplyFunc(common.SetDeviceInit, func(int32) { return }) defer mockFunc.Reset() convey.Convey("01-get task dev fault info list failed", func() { @@ -2010,12 +2011,12 @@ func TestRestartRequestProcess(t *testing.T) { manager.restartRequestProcess(taskName, resetInfo, nil) }) convey.Convey("03-fault dev list do not upgrade", func() { - mockFunc1 := mockCheckDevErrorCode("", false, errors.New("mock error")) + mockFunc1 := mockCheckDevErrorCode("", false, mockErr) defer mockFunc1.Reset() manager.restartRequestProcess(taskName, resetInfo, nil) }) convey.Convey("04-upgrade restart request process failed ", func() { - mockFunc1 := mockCheckDevErrorCode("", true, errors.New("mock error")) + mockFunc1 := mockCheckDevErrorCode("", true, mockErr) defer mockFunc1.Reset() manager.restartRequestProcess(taskName, resetInfo, nil) }) diff --git a/component/ascend-docker-runtime/cli/test/dt_go/build.sh b/component/ascend-docker-runtime/cli/test/dt_go/build.sh index e19c0dacba2758b2f3045f82cdb161a36a8f5772..c99057fcaa8ff128e75b9422234f3afab990c3b1 100644 --- a/component/ascend-docker-runtime/cli/test/dt_go/build.sh +++ b/component/ascend-docker-runtime/cli/test/dt_go/build.sh @@ -37,9 +37,9 @@ function execute_test() { coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + echo "coverage passed: $total_coverage%" else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/ascend-for-volcano/build/testBuild.sh b/component/ascend-for-volcano/build/testBuild.sh index 19af45ecae1017bd6f4fafde022ab785930c243d..82e16017bd0a7171d38b102a6f29d0a9160c6243 100644 --- a/component/ascend-for-volcano/build/testBuild.sh +++ b/component/ascend-for-volcano/build/testBuild.sh @@ -47,10 +47,10 @@ else # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/ascend-operator/build/test.sh b/component/ascend-operator/build/test.sh index e0aa3a9665a6ea370d1371a1f06ff224c59b8635..40d24e41974d8c5185e34693e37d4b888ec50da5 100644 --- a/component/ascend-operator/build/test.sh +++ b/component/ascend-operator/build/test.sh @@ -30,11 +30,11 @@ function execute_test() { # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" exit 0 else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/clusterd/build/test.sh b/component/clusterd/build/test.sh index e7804463835c1403fa45e8ff23ddecc0c9142c21..b9db11a58604d1271b741813b10099fabba0b283 100644 --- a/component/clusterd/build/test.sh +++ b/component/clusterd/build/test.sh @@ -34,10 +34,10 @@ function execute_test() { # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/noded/build/test.sh b/component/noded/build/test.sh index dbf0b254f02cf4f3b820296ea38e088d94d0259b..6983188278a723a9c82c566141eab08919ba2abb 100644 --- a/component/noded/build/test.sh +++ b/component/noded/build/test.sh @@ -31,11 +31,11 @@ function execute_test() { # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" exit 0 else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/npu-exporter/build/test.sh b/component/npu-exporter/build/test.sh index e794ee8129235e4e8ba5e45ea7d535a0c58ea5fd..5460ae50c398be376e9cd86324755ce3507f386e 100644 --- a/component/npu-exporter/build/test.sh +++ b/component/npu-exporter/build/test.sh @@ -31,11 +31,11 @@ function execute_test() { # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" exit 0 else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." exit 1 fi fi diff --git a/component/taskd/tests/ut/go/run_test.sh b/component/taskd/tests/ut/go/run_test.sh index a0e516f49553bbc58a8c0a192a3db745ba5663d3..4034b3616a551d3ceda73e4c6c6118f5b4259891 100644 --- a/component/taskd/tests/ut/go/run_test.sh +++ b/component/taskd/tests/ut/go/run_test.sh @@ -38,10 +38,10 @@ function unit_test() { # round up coverage=$(echo "$total_coverage" | awk '{if ($1 >= 0) print ($1 == int($1)) ? int($1) : int($1) + 1;\ else print ($1 == int($1)) ? int($1) : int($1)}') - if [[ $coverage -ge 80 ]]; then - echo "coverage passed: $coverage%" + if [[ $coverage -gt 80 ]]; then + echo "coverage passed: $total_coverage%" else - echo "coverage failed: $coverage%, it needs to be greater than 80%." + echo "coverage failed: $total_coverage%, it needs to be greater than 80%." # exit 1 fi fi