From a05ede23c1be3f5dd11220357dcc2cfd0c8df773 Mon Sep 17 00:00:00 2001 From: tianshapjq Date: Sat, 14 Jul 2018 16:17:45 +0800 Subject: [PATCH] should be fmt.printf in the e2e test --- test/e2e/framework/authorizer_util.go | 8 ++++---- test/e2e/instrumentation/monitoring/prometheus.go | 4 ++-- test/e2e/node/events.go | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/e2e/framework/authorizer_util.go b/test/e2e/framework/authorizer_util.go index 16a02fd899d..e238457b800 100644 --- a/test/e2e/framework/authorizer_util.go +++ b/test/e2e/framework/authorizer_util.go @@ -17,7 +17,7 @@ limitations under the License. package framework import ( - "fmt" + "github.com/golang/glog" "sync" "time" @@ -62,7 +62,7 @@ func WaitForNamedAuthorizationUpdate(c v1beta1authorization.SubjectAccessReviews // GKE doesn't enable the SAR endpoint. Without this endpoint, we cannot determine if the policy engine // has adjusted as expected. In this case, simply wait one second and hope it's up to date if apierrors.IsNotFound(err) { - fmt.Printf("SubjectAccessReview endpoint is missing\n") + glog.Info("SubjectAccessReview endpoint is missing") time.Sleep(1 * time.Second) return true, nil } @@ -94,7 +94,7 @@ func BindClusterRole(c v1beta1rbac.ClusterRoleBindingsGetter, clusterRole, ns st // if we failed, don't fail the entire test because it may still work. RBAC may simply be disabled. if err != nil { - fmt.Printf("Error binding clusterrole/%s for %q for %v\n", clusterRole, ns, subjects) + glog.Errorf("Error binding clusterrole/%s for %q for %v\n", clusterRole, ns, subjects) } } @@ -124,7 +124,7 @@ func bindInNamespace(c v1beta1rbac.RoleBindingsGetter, roleType, role, ns string // if we failed, don't fail the entire test because it may still work. RBAC may simply be disabled. if err != nil { - fmt.Printf("Error binding %s/%s into %q for %v\n", roleType, role, ns, subjects) + glog.Errorf("Error binding %s/%s into %q for %v\n", roleType, role, ns, subjects) } } diff --git a/test/e2e/instrumentation/monitoring/prometheus.go b/test/e2e/instrumentation/monitoring/prometheus.go index 5b2d2e1b126..f3634d258c3 100644 --- a/test/e2e/instrumentation/monitoring/prometheus.go +++ b/test/e2e/instrumentation/monitoring/prometheus.go @@ -238,7 +238,7 @@ func fetchPrometheusTargetDiscovery(c clientset.Interface) (TargetDiscovery, err Raw() var qres promTargetsResponse if err != nil { - fmt.Printf(string(response)) + framework.Logf(string(response)) return qres.Data, err } err = json.Unmarshal(response, &qres) @@ -297,7 +297,7 @@ func queryPrometheus(c clientset.Interface, query string, start, end time.Time, Do(). Raw() if err != nil { - fmt.Printf(string(response)) + framework.Logf(string(response)) return nil, err } var qres promQueryResponse diff --git a/test/e2e/node/events.go b/test/e2e/node/events.go index 84179de1324..158adce130c 100644 --- a/test/e2e/node/events.go +++ b/test/e2e/node/events.go @@ -17,7 +17,6 @@ limitations under the License. package node import ( - "fmt" "strconv" "time" @@ -84,7 +83,7 @@ var _ = SIGDescribe("Events", func() { if err != nil { framework.Failf("Failed to get pod: %v", err) } - fmt.Printf("%+v\n", podWithUid) + framework.Logf("%+v\n", podWithUid) var events *v1.EventList // Check for scheduler event about the pod. By("checking for scheduler event about the pod") @@ -101,7 +100,7 @@ var _ = SIGDescribe("Events", func() { return false, err } if len(events.Items) > 0 { - fmt.Println("Saw scheduler event for our pod.") + framework.Logf("Saw scheduler event for our pod.") return true, nil } return false, nil @@ -121,7 +120,7 @@ var _ = SIGDescribe("Events", func() { return false, err } if len(events.Items) > 0 { - fmt.Println("Saw kubelet event for our pod.") + framework.Logf("Saw kubelet event for our pod.") return true, nil } return false, nil