From e7998d4c3ed0de5e56b9d0b153cdd615569e8395 Mon Sep 17 00:00:00 2001
From: fengcaiwen <895703375@qq.com>
Date: Wed, 24 Dec 2025 10:57:41 +0800
Subject: [PATCH] refactor: fix log

---
 pkg/handler/function_ssh_test.go |  7 +++++++
 pkg/handler/function_test.go     |  7 +++++++
 pkg/handler/mode_run_ssh_test.go | 14 ++++++++------
 pkg/handler/mode_run_test.go     | 14 ++++++++------
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/pkg/handler/function_ssh_test.go b/pkg/handler/function_ssh_test.go
index 19b2bfce..9bdd02ab 100644
--- a/pkg/handler/function_ssh_test.go
+++ b/pkg/handler/function_ssh_test.go
@@ -814,6 +814,13 @@ func (u *sshUt) kubevpnUninstall(ns string) func(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			cmd = exec.Command("kubectl", "delete", "ns", ns, "--wait")
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			err = cmd.Run()
+			if err != nil {
+				t.Fatal(err)
+			}
 		}
 	}
 	return func(t *testing.T) {
diff --git a/pkg/handler/function_test.go b/pkg/handler/function_test.go
index a120c58b..9e05c724 100644
--- a/pkg/handler/function_test.go
+++ b/pkg/handler/function_test.go
@@ -851,6 +851,13 @@ func (u *ut) kubevpnUninstall(ns string) func(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			cmd = exec.Command("kubectl", "delete", "ns", ns, "--wait")
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			err = cmd.Run()
+			if err != nil {
+				t.Fatal(err)
+			}
 		}
 	}
 	return func(t *testing.T) {
diff --git a/pkg/handler/mode_run_ssh_test.go b/pkg/handler/mode_run_ssh_test.go
index 228b3c8a..3835b124 100644
--- a/pkg/handler/mode_run_ssh_test.go
+++ b/pkg/handler/mode_run_ssh_test.go
@@ -12,16 +12,18 @@ import (
 	"sync"
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
+
 	"github.com/wencaiwulue/kubevpn/v2/pkg/util"
 )
 
 func (u *sshUt) deleteDeployForSaveResource(t *testing.T) {
-	for _, s := range []string{"deploy/productpage", "deploy/ratings"} {
-		cmd := exec.Command("kubectl", "delete", s, "--force")
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		err := cmd.Run()
-		if err != nil {
+	options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
+	for _, s := range []string{"productpage", "ratings"} {
+		err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
+		if err != nil && !errors.IsNotFound(err) {
 			t.Fatal(err)
 		}
 	}
diff --git a/pkg/handler/mode_run_test.go b/pkg/handler/mode_run_test.go
index 6a926ed8..6aa85bc6 100644
--- a/pkg/handler/mode_run_test.go
+++ b/pkg/handler/mode_run_test.go
@@ -12,16 +12,18 @@ import (
 	"sync"
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
+
 	"github.com/wencaiwulue/kubevpn/v2/pkg/util"
 )
 
 func (u *ut) deleteDeployForSaveResource(t *testing.T) {
-	for _, s := range []string{"deploy/productpage", "deploy/ratings"} {
-		cmd := exec.Command("kubectl", "delete", s, "--force")
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		err := cmd.Run()
-		if err != nil {
+	options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
+	for _, s := range []string{"productpage", "ratings"} {
+		err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
+		if err != nil && !errors.IsNotFound(err) {
 			t.Fatal(err)
 		}
 	}