From 5214be3f1655b2cd76d23b2bf40f028ecc58a735 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Mon, 8 Oct 2018 18:50:01 -0700 Subject: [PATCH] Fix WaitTimeoutForPodEvent logic --- test/e2e/framework/util.go | 12 ++++-------- test/e2e/storage/testsuites/subpath.go | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index b0ddff8de8c..68ef1367b90 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1465,10 +1465,10 @@ func podRunning(c clientset.Interface, podName, namespace string) wait.Condition // WaitTimeoutForPodEvent waits for an event to occur for a pod func WaitTimeoutForPodEvent(c clientset.Interface, podName, namespace, eventSelector, msg string, timeout time.Duration) error { - return wait.PollImmediate(Poll, timeout, eventOccured(c, podName, namespace, eventSelector, msg)) + return wait.PollImmediate(Poll, timeout, eventOccurred(c, podName, namespace, eventSelector, msg)) } -func eventOccured(c clientset.Interface, podName, namespace, eventSelector, msg string) wait.ConditionFunc { +func eventOccurred(c clientset.Interface, podName, namespace, eventSelector, msg string) wait.ConditionFunc { options := metav1.ListOptions{FieldSelector: eventSelector} return func() (bool, error) { events, err := c.CoreV1().Events(namespace).List(options) @@ -1476,13 +1476,9 @@ func eventOccured(c clientset.Interface, podName, namespace, eventSelector, msg return false, fmt.Errorf("got error while getting pod events: %s", err) } if len(events.Items) == 0 { - return false, fmt.Errorf("no events found") - } - if strings.Contains(events.Items[0].Message, msg) { - return false, fmt.Errorf("%q error not found", msg) - } else { - return true, nil + return false, nil // no events have occurred yet } + return strings.Contains(events.Items[0].Message, msg), nil } } diff --git a/test/e2e/storage/testsuites/subpath.go b/test/e2e/storage/testsuites/subpath.go index c5ff0ead938..b2ccfa29a75 100644 --- a/test/e2e/storage/testsuites/subpath.go +++ b/test/e2e/storage/testsuites/subpath.go @@ -597,7 +597,7 @@ func testPodFailSubpathError(f *framework.Framework, pod *v1.Pod, errorMsg strin "reason": "Failed", }.AsSelector().String() err = framework.WaitTimeoutForPodEvent(f.ClientSet, pod.Name, f.Namespace.Name, selector, errorMsg, framework.PodEventTimeout) - Expect(err).To(HaveOccurred(), "while waiting for failed event to occur") + Expect(err).NotTo(HaveOccurred(), "while waiting for failed event to occur") } // Tests that the existing subpath mount is detected when a container restarts