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

Cleanup test/e2e/common directory - part2

Browse Source
This commit is contained in:
wojtekt
2021-03-03 07:57:20 +01:00
parent 5b0d0451ff
commit 3b438eb4e5
21 changed files with 243 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e_node/runtime_conformance_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/kubelet/images"
"k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/common/node"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e_node/services"
@@ -68,7 +68,7 @@ var _ = SIGDescribe("Container Runtime Conformance Test", 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{
container := node.ConformanceContainer{
PodClient: f.PodClient(),
Container: v1.Container{
Name: name,
@@ -98,13 +98,13 @@ var _ = SIGDescribe("Container Runtime Conformance Test", func() {
if !testCase.waiting {
if status.State.Running == nil {
return fmt.Errorf("expected container state: Running, got: %q",
common.GetContainerState(status.State))
node.GetContainerState(status.State))
}
}
if testCase.waiting {
if status.State.Waiting == nil {
return fmt.Errorf("expected container state: Waiting, got: %q",
common.GetContainerState(status.State))
node.GetContainerState(status.State))
}
reason := status.State.Waiting.Reason
if reason != images.ErrImagePull.Error() &&
@@ -130,7 +130,7 @@ var _ = SIGDescribe("Container Runtime Conformance Test", func() {
ginkgo.By("create the container")
container.Create()
ginkgo.By("check the container status")
for start := time.Now(); time.Since(start) < common.ContainerStatusRetryTimeout; time.Sleep(common.ContainerStatusPollInterval) {
for start := time.Now(); time.Since(start) < node.ContainerStatusRetryTimeout; time.Sleep(node.ContainerStatusPollInterval) {
if err = checkContainerStatus(); err == nil {
break
}