quiet integration test logs

This commit is contained in:
Jordan Liggitt
2019-04-19 23:15:31 -04:00
parent b384712024
commit aee1997a19
4 changed files with 26 additions and 12 deletions

View File

@@ -139,13 +139,19 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
}()
lastHealth := ""
attempt := 0
if err := wait.PollImmediate(time.Second, time.Minute, func() (done bool, err error) {
// wait for the server to be healthy
result := kubeClient.RESTClient().Get().AbsPath("/healthz").Do()
content, _ := result.Raw()
lastHealth = string(content)
if errResult := result.Error(); errResult != nil {
t.Log(errResult)
attempt++
if attempt < 10 {
t.Log("waiting for server to be healthy")
} else {
t.Log(errResult)
}
return false, nil
}
var status int

View File

@@ -78,8 +78,10 @@ go_library(
"//staging/src/k8s.io/client-go/util/cert:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/coreos/etcd/clientv3:go_default_library",
"//vendor/github.com/go-openapi/spec:go_default_library",
"//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
],

View File

@@ -27,6 +27,8 @@ import (
"runtime"
"strings"
"github.com/coreos/etcd/clientv3"
"google.golang.org/grpc/grpclog"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/util/env"
@@ -109,7 +111,7 @@ func startEtcd() (func(), error) {
"--listen-peer-urls",
"http://127.0.0.1:0",
"--log-package-levels",
"*=DEBUG",
"*=NOTICE", // set to INFO or DEBUG for more logs
)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
@@ -123,6 +125,10 @@ func startEtcd() (func(), error) {
}
}
// Quiet etcd logs for integration tests
// Comment out to get verbose logs if desired
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr))
if err := cmd.Start(); err != nil {
return nil, fmt.Errorf("failed to run etcd: %v", err)
}