github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77894 from draveness/feature/refactor-test-e2e-apps

Browse Source 
feat: use framework.ExpectNoError in e2e apps disruption
This commit is contained in:
Kubernetes Prow Robot 2019-05-16 06:07:42 -07:00 committed by GitHub
commit 1284c99ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/apps/disruption.go
View File

@ -166,7 +166,7 @@ var _ = SIGDescribe("DisruptionController", func() {
// Locate a running pod.
pod, err := locateRunningPod(cs, ns)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
framework.ExpectNoError(err)
e := &policy.Eviction{
ObjectMeta: metav1.ObjectMeta{
@ -205,7 +205,7 @@ var _ = SIGDescribe("DisruptionController", func() {
ginkgo.By("First trying to evict a pod which shouldn't be evictable")
pod, err := locateRunningPod(cs, ns)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
framework.ExpectNoError(err)
waitForPodsOrDie(cs, ns, 3) // make sure that they are running and so would be evictable with a different pdb
e := &policy.Eviction{
@ -223,7 +223,7 @@ var _ = SIGDescribe("DisruptionController", func() {
ginkgo.By("Trying to evict the same pod we tried earlier which should now be evictable")
waitForPodsOrDie(cs, ns, 3)
err = cs.CoreV1().Pods(ns).Evict(e)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) // the eviction is now allowed
framework.ExpectNoError(err) // the eviction is now allowed
})
})