github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Remove test_verify from e2e framework package

Browse Source 
test_verify.go contained the function TestPodSuccessOrFail() only,
and the function is used in the package only.
This moves the function to create.go and remove test_verify.go.
This commit is contained in:
Kenichi Omichi 2019-10-12 00:00:27 +00:00
parent a847874655
commit ab208e9063
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/pod/BUILD
View File

@ -7,7 +7,6 @@ go_library(
"delete.go", "delete.go",
"node_selection.go", "node_selection.go",
"resource.go", "resource.go",
"test_verify.go",
"wait.go", "wait.go",
], ],
importpath = "k8s.io/kubernetes/test/e2e/framework/pod", importpath = "k8s.io/kubernetes/test/e2e/framework/pod",

12
test/e2e/framework/pod/create.go
View File

@ -50,13 +50,23 @@ func CreateWaitAndDeletePod(c clientset.Interface, ns string, pvc *v1.Persistent
} }
}() }()
err = TestPodSuccessOrFail(c, ns, runPod) err = testPodSuccessOrFail(c, ns, runPod)
if err != nil { if err != nil {
return fmt.Errorf("pod %q did not exit with Success: %v", runPod.Name, err) return fmt.Errorf("pod %q did not exit with Success: %v", runPod.Name, err)
} }
return // note: named return value return // note: named return value
} }
// testPodSuccessOrFail tests whether the pod's exit code is zero.
func testPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error {
e2elog.Logf("Pod should terminate with exitcode 0 (success)")
if err := WaitForPodSuccessInNamespace(c, pod.Name, ns); err != nil {
return fmt.Errorf("pod %q failed to reach Success: %v", pod.Name, err)
}
e2elog.Logf("Pod %v succeeded ", pod.Name)
return nil
}
// CreateUnschedulablePod with given claims based on node selector // CreateUnschedulablePod with given claims based on node selector
func CreateUnschedulablePod(client clientset.Interface, namespace string, nodeSelector map[string]string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) (*v1.Pod, error) { func CreateUnschedulablePod(client clientset.Interface, namespace string, nodeSelector map[string]string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) (*v1.Pod, error) {
pod := MakePod(namespace, nodeSelector, pvclaims, isPrivileged, command) pod := MakePod(namespace, nodeSelector, pvclaims, isPrivileged, command)

37
test/e2e/framework/pod/test_verify.go
View File

@ -1,37 +0,0 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package pod
import (
"fmt"
"github.com/onsi/ginkgo"
v1 "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
)
// TestPodSuccessOrFail tests whether the pod's exit code is zero.
func TestPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error {
ginkgo.By("Pod should terminate with exitcode 0 (success)")
if err := WaitForPodSuccessInNamespace(c, pod.Name, ns); err != nil {
return fmt.Errorf("pod %q failed to reach Success: %v", pod.Name, err)
}
e2elog.Logf("Pod %v succeeded ", pod.Name)
return nil
}