From f81abad51ca768010da5328af49693bda63e6f4a Mon Sep 17 00:00:00 2001 From: Masaki Kimura Date: Mon, 26 Nov 2018 17:21:20 +0000 Subject: [PATCH 1/2] Fix eventOccurred to check message from all the events --- test/e2e/framework/util.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 59d58947f62..a1c6fe69010 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1496,10 +1496,12 @@ func eventOccurred(c clientset.Interface, podName, namespace, eventSelector, msg if err != nil { return false, fmt.Errorf("got error while getting pod events: %s", err) } - if len(events.Items) == 0 { - return false, nil // no events have occurred yet + for _, event := range events.Items { + if strings.Contains(event.Message, msg) { + return true, nil + } } - return strings.Contains(events.Items[0].Message, msg), nil + return false, nil } } From 790de995f35c53b79d0f5d7bf65e3bf1d0c5a197 Mon Sep 17 00:00:00 2001 From: Masaki Kimura Date: Mon, 26 Nov 2018 17:29:25 +0000 Subject: [PATCH 2/2] Fix testPodFailSubpathError to make only WaitTimeoutForPodEvent wait --- test/e2e/storage/testsuites/subpath.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/storage/testsuites/subpath.go b/test/e2e/storage/testsuites/subpath.go index 619b1d545a0..b87cf85a7a1 100644 --- a/test/e2e/storage/testsuites/subpath.go +++ b/test/e2e/storage/testsuites/subpath.go @@ -587,8 +587,6 @@ func testPodFailSubpathError(f *framework.Framework, pod *v1.Pod, errorMsg strin defer func() { framework.DeletePodWithWait(f, f.ClientSet, pod) }() - err = framework.WaitForPodRunningInNamespace(f.ClientSet, pod) - Expect(err).To(HaveOccurred(), "while waiting for pod to be running") By("Checking for subpath error event") selector := fields.Set{