apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fix log

Browse Source
This commit is contained in:
fengcaiwen
2025-12-24 10:57:41 +08:00
parent 68cd916dd1
commit e7998d4c3e
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/handler/function_ssh_test.go
View File

@@ -814,6 +814,13 @@ func (u *sshUt) kubevpnUninstall(ns string) func(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) 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) { return func(t *testing.T) {

7
pkg/handler/function_test.go
View File

@@ -851,6 +851,13 @@ func (u *ut) kubevpnUninstall(ns string) func(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) 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) { return func(t *testing.T) {

14
pkg/handler/mode_run_ssh_test.go
View File

@@ -12,16 +12,18 @@ import (
"sync" "sync"
"testing" "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" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (u *sshUt) deleteDeployForSaveResource(t *testing.T) { func (u *sshUt) deleteDeployForSaveResource(t *testing.T) {
for _, s := range []string{"deploy/productpage", "deploy/ratings"} { options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
cmd := exec.Command("kubectl", "delete", s, "--force") for _, s := range []string{"productpage", "ratings"} {
cmd.Stdout = os.Stdout err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
cmd.Stderr = os.Stderr if err != nil && !errors.IsNotFound(err) {
err := cmd.Run()
if err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }

14
pkg/handler/mode_run_test.go
View File

@@ -12,16 +12,18 @@ import (
"sync" "sync"
"testing" "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" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (u *ut) deleteDeployForSaveResource(t *testing.T) { func (u *ut) deleteDeployForSaveResource(t *testing.T) {
for _, s := range []string{"deploy/productpage", "deploy/ratings"} { options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
cmd := exec.Command("kubectl", "delete", s, "--force") for _, s := range []string{"productpage", "ratings"} {
cmd.Stdout = os.Stdout err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
cmd.Stderr = os.Stderr if err != nil && !errors.IsNotFound(err) {
err := cmd.Run()
if err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }