diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index b1d520b9f6..a4848421cf 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1216,10 +1216,10 @@ func waitTimeoutForPodRunningInNamespace(c *client.Client, podName, namespace, r // Waits default amount of time (podNoLongerRunningTimeout) for the specified pod to stop running. // Returns an error if timeout occurs first. func WaitForPodNoLongerRunningInNamespace(c *client.Client, podName, namespace, resourceVersion string) error { - return waitTimeoutForPodNoLongerRunningInNamespace(c, podName, namespace, resourceVersion, podNoLongerRunningTimeout) + return WaitTimeoutForPodNoLongerRunningInNamespace(c, podName, namespace, resourceVersion, podNoLongerRunningTimeout) } -func waitTimeoutForPodNoLongerRunningInNamespace(c *client.Client, podName, namespace, resourceVersion string, timeout time.Duration) error { +func WaitTimeoutForPodNoLongerRunningInNamespace(c *client.Client, podName, namespace, resourceVersion string, timeout time.Duration) error { w, err := c.Pods(namespace).Watch(api.SingleObject(api.ObjectMeta{Name: podName, ResourceVersion: resourceVersion})) if err != nil { return err diff --git a/test/e2e_node/apparmor_test.go b/test/e2e_node/apparmor_test.go index e23dcbf5ee..827ba4f1dc 100644 --- a/test/e2e_node/apparmor_test.go +++ b/test/e2e_node/apparmor_test.go @@ -146,7 +146,9 @@ func loadTestProfiles() error { func runAppArmorTest(f *framework.Framework, profile string) api.PodStatus { pod := createPodWithAppArmor(f, profile) - framework.ExpectNoError(f.WaitForPodNoLongerRunning(pod.Name)) + // The pod needs to start before it stops, so wait for the longer start timeout. + framework.ExpectNoError(framework.WaitTimeoutForPodNoLongerRunningInNamespace( + f.Client, pod.Name, f.Namespace.Name, "", framework.PodStartTimeout)) p, err := f.PodClient().Get(pod.Name) framework.ExpectNoError(err) return p.Status