github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

don't fail etcd SIGKILL test when apiserver returns an error

Browse Source
This commit is contained in:
Mike Danese 2015-06-22 15:44:30 -07:00
parent 19991d5315
commit c5564502a6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/etcd_failure.go
View File

@ -123,7 +123,10 @@ func checkExistingRCRecovers(f Framework) {
By("deleting pods from existing replication controller") By("deleting pods from existing replication controller")
expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) { expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) {
pods, err := podClient.List(rcSelector, fields.Everything()) pods, err := podClient.List(rcSelector, fields.Everything())
Expect(err).NotTo(HaveOccurred()) if err != nil {
Logf("apiserver returned error, as expected before recovery: %v", err)
return false, nil
}
if len(pods.Items) == 0 { if len(pods.Items) == 0 {
return false, nil return false, nil
} }
@ -131,6 +134,7 @@ func checkExistingRCRecovers(f Framework) {
err = podClient.Delete(pod.Name, api.NewDeleteOptions(0)) err = podClient.Delete(pod.Name, api.NewDeleteOptions(0))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
Logf("apiserver has recovered")
return true, nil return true, nil
})) }))