github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10201 from mikedanese/fixup-etcd 

don't fail etcd SIGKILL test when apiserver returns an error
pull/6/head
Jeff Lowdermilk 2015-06-23 11:35:10 -07:00
parent 79ae24f747 c5564502a6
commit 207c53b7e6
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")
expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) {
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 {
return false, nil
}
@ -131,6 +134,7 @@ func checkExistingRCRecovers(f Framework) {
err = podClient.Delete(pod.Name, api.NewDeleteOptions(0))
Expect(err).NotTo(HaveOccurred())
}
Logf("apiserver has recovered")
return true, nil
}))