clean up test code

2019-08-27 17:18:43 +08:00
parent c4c64673d7
commit d1290ffdef
41 changed files with 216 additions and 260 deletions
--- a/test/e2e_node/image_id_test.go
+++ b/test/e2e_node/image_id_test.go
@@ -20,7 +20,6 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"

 	"github.com/davecgh/go-spew/spew"
@@ -59,7 +58,7 @@ var _ = framework.KubeDescribe("ImageID [NodeFeature: ImageID]", func() {
 		status := runningPod.Status

 		if len(status.ContainerStatuses) == 0 {
-			e2elog.Failf("Unexpected pod status; %s", spew.Sdump(status))
+			framework.Failf("Unexpected pod status; %s", spew.Sdump(status))
 			return
 		}