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

Merge pull request #79162 from SataQiu/fix-test-20190619

Browse Source 
Refactor: replace framework.Failf with e2elog.Failf
This commit is contained in:
Kubernetes Prow Robot
2019-06-21 12:17:04 -07:00
committed by GitHub
parent 5c61d51a32 332be4b1e3
commit dc8b928136
144 changed files with 767 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ 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"
@@ -103,11 +104,11 @@ func SubstituteImageName(content string) string {
contentWithImageName := new(bytes.Buffer)
tmpl, err := template.New("imagemanifest").Parse(content)
if err != nil {
framework.Failf("Failed Parse the template: %v", err)
e2elog.Failf("Failed Parse the template: %v", err)
}
err = tmpl.Execute(contentWithImageName, testImages)
if err != nil {
framework.Failf("Failed executing template: %v", err)
e2elog.Failf("Failed executing template: %v", err)
}
return contentWithImageName.String()
}