refactor e2e_node conformance test

Signed-off-by: liang chenye <liangchenye@huawei.com>
This commit is contained in:
liang chenye
2016-04-23 10:50:02 +08:00
parent 945daaae91
commit aa3bf1faac
6 changed files with 309 additions and 186 deletions

View File

@@ -21,6 +21,7 @@ import (
"time"
"k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -38,7 +39,8 @@ var _ = Describe("Kubelet Container Manager", func() {
namespace := "oom-adj"
Context("when scheduling a busybox command that always fails in a pod", func() {
podName := "bin-false"
It("it should return succes", func() {
BeforeEach(func() {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
Name: podName,
@@ -58,6 +60,7 @@ var _ = Describe("Kubelet Container Manager", func() {
},
},
}
_, err := cl.Pods(namespace).Create(pod)
Expect(err).To(BeNil(), fmt.Sprintf("Error creating Pod %v", err))
})
@@ -86,6 +89,18 @@ var _ = Describe("Kubelet Container Manager", func() {
err := cl.Pods(namespace).Delete(podName, &api.DeleteOptions{})
Expect(err).To(BeNil(), fmt.Sprintf("Error deleting Pod %v", err))
})
AfterEach(func() {
cl.Pods(namespace).Delete(podName, &api.DeleteOptions{})
Eventually(func() bool {
_, err := cl.Pods(namespace).Get(podName)
if err != nil && apierrs.IsNotFound(err) {
return true
}
return false
}, time.Minute, time.Second*4).Should(BeTrue())
})
})
})