chore: try to fix testcase

This commit is contained in:
fengcaiwen
2023-10-21 19:13:48 +08:00
parent 7ef69b5f30
commit 4c616bda95

View File

@@ -3,15 +3,11 @@ package handler
import ( import (
"context" "context"
"fmt" "fmt"
"k8s.io/apimachinery/pkg/util/intstr"
json2 "k8s.io/apimachinery/pkg/util/json"
"net" "net"
"net/http" "net/http"
"os/exec" "os/exec"
"reflect" "reflect"
"runtime" "runtime"
"sigs.k8s.io/yaml"
"strings"
"sync" "sync"
"testing" "testing"
"time" "time"
@@ -20,6 +16,8 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/util/intstr"
json2 "k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
@@ -27,6 +25,7 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/pkg/util"
) )
@@ -308,24 +307,16 @@ func server(port int) {
func kubevpnConnect(t *testing.T) { func kubevpnConnect(t *testing.T) {
ctx2, timeoutFunc := context.WithTimeout(context.Background(), 2*time.Hour) ctx2, timeoutFunc := context.WithTimeout(context.Background(), 2*time.Hour)
cmd := exec.Command("kubevpn", "proxy", "--debug", "deployments/reviews")
go func() {
stdout, stderr, err := util.RunWithRollingOutWithChecker(cmd, func(log string) {
ok := strings.Contains(log, "dns service ok")
if ok {
timeoutFunc()
}
})
defer timeoutFunc() defer timeoutFunc()
cmd := exec.CommandContext(ctx2, "kubevpn", "proxy", "--debug", "deployments/reviews")
output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
t.Log(stdout, stderr) t.Log(string(output))
t.Error(err) t.Error(err)
t.Fail() t.Fail()
return return
} }
}()
<-ctx2.Done()
} }
func init1() { func init1() {