github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use log functions of core framework

Browse Source
This commit is contained in:
YuikoTakada
2019-09-26 02:45:07 +00:00
parent 45f7f70479
commit 9ed2f632cc
18 changed files with 142 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common/util.go
View File

@@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/onsi/ginkgo"
@@ -104,11 +103,11 @@ func SubstituteImageName(content string) string {
contentWithImageName := new(bytes.Buffer)
tmpl, err := template.New("imagemanifest").Parse(content)
if err != nil {
e2elog.Failf("Failed Parse the template: %v", err)
framework.Failf("Failed Parse the template: %v", err)
}
err = tmpl.Execute(contentWithImageName, testImages)
if err != nil {
e2elog.Failf("Failed executing template: %v", err)
framework.Failf("Failed executing template: %v", err)
}
return contentWithImageName.String()
}