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

e2e_node: clean up non-recommended import

Browse Source
This commit is contained in:
SataQiu
2019-07-28 12:49:36 +08:00
parent 23649560c0
commit 641d330f89
35 changed files with 763 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/runtime_conformance_test.go
View File

@@ -30,15 +30,15 @@ import (
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"k8s.io/kubernetes/test/e2e_node/services"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo"
)
var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
f := framework.NewDefaultFramework("runtime-conformance")
Describe("container runtime conformance blackbox test", func() {
ginkgo.Describe("container runtime conformance blackbox test", func() {
Context("when running a container with a new image", func() {
ginkgo.Context("when running a container with a new image", func() {
// The service account only has pull permission
auth := `
{
@@ -66,7 +66,7 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
},
} {
testCase := testCase
It(testCase.description+" [NodeConformance]", func() {
ginkgo.It(testCase.description+" [NodeConformance]", func() {
name := "image-pull-test"
command := []string{"/bin/sh", "-c", "while true; do sleep 1; done"}
container := common.ConformanceContainer{
@@ -128,15 +128,15 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
const flakeRetry = 3
for i := 1; i <= flakeRetry; i++ {
var err error
By("create the container")
ginkgo.By("create the container")
container.Create()
By("check the container status")
ginkgo.By("check the container status")
for start := time.Now(); time.Since(start) < common.ContainerStatusRetryTimeout; time.Sleep(common.ContainerStatusPollInterval) {
if err = checkContainerStatus(); err == nil {
break
}
}
By("delete the container")
ginkgo.By("delete the container")
container.Delete()
if err == nil {
break