github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45103 from sttts/sttts-deflake-statefuls-wait-until

Browse Source 
Automatic merge from submit-queue

e2e: deflake wait.Until in StatefulSet test
This commit is contained in:
Kubernetes Submit Queue 2017-04-29 20:38:50 -07:00 committed by GitHub
commit 55e552d24d
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/statefulset.go
View File

@ -315,6 +315,9 @@ var _ = framework.KubeDescribe("StatefulSet", func() {
expectedPodName := ss.Name + "-1" expectedPodName := ss.Name + "-1"
expectedPod, err := f.ClientSet.Core().Pods(ns).Get(expectedPodName, metav1.GetOptions{}) expectedPod, err := f.ClientSet.Core().Pods(ns).Get(expectedPodName, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Verifying the 2nd pod is removed only when it becomes running and ready")
sst.RestoreProbe(ss, testProbe)
watcher, err := f.ClientSet.Core().Pods(ns).Watch(metav1.SingleObject( watcher, err := f.ClientSet.Core().Pods(ns).Watch(metav1.SingleObject(
metav1.ObjectMeta{ metav1.ObjectMeta{
Name: expectedPod.Name, Name: expectedPod.Name,
@ -322,9 +325,6 @@ var _ = framework.KubeDescribe("StatefulSet", func() {
}, },
)) ))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Verifying the 2nd pod is removed only when it becomes running and ready")
sst.RestoreProbe(ss, testProbe)
_, err = watch.Until(framework.StatefulSetTimeout, watcher, func(event watch.Event) (bool, error) { _, err = watch.Until(framework.StatefulSetTimeout, watcher, func(event watch.Event) (bool, error) {
pod := event.Object.(*v1.Pod) pod := event.Object.(*v1.Pod)
if event.Type == watch.Deleted && pod.Name == expectedPodName { if event.Type == watch.Deleted && pod.Name == expectedPodName {