diff --git a/test/e2e/common/sysctl.go b/test/e2e/common/sysctl.go index 3c26f7bc07d..457ab3317b1 100644 --- a/test/e2e/common/sysctl.go +++ b/test/e2e/common/sysctl.go @@ -89,7 +89,7 @@ var _ = framework.KubeDescribe("Sysctls [LinuxOnly] [NodeFeature:Sysctls]", func gomega.Expect(ev).To(gomega.BeNil()) ginkgo.By("Waiting for pod completion") - err = f.WaitForPodNoLongerRunning(pod.Name) + err = e2epod.WaitForPodNoLongerRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) framework.ExpectNoError(err) pod, err = podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err) @@ -129,7 +129,7 @@ var _ = framework.KubeDescribe("Sysctls [LinuxOnly] [NodeFeature:Sysctls]", func gomega.Expect(ev).To(gomega.BeNil()) ginkgo.By("Waiting for pod completion") - err = f.WaitForPodNoLongerRunning(pod.Name) + err = e2epod.WaitForPodNoLongerRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) framework.ExpectNoError(err) pod, err = podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index e574a8ee3b9..e05b0615eb3 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -539,12 +539,6 @@ func (f *Framework) WaitForPodRunningSlow(podName string) error { return e2epod.WaitForPodRunningInNamespaceSlow(f.ClientSet, podName, f.Namespace.Name) } -// WaitForPodNoLongerRunning waits for the pod to no longer be running in the namespace, for either -// success or failure. -func (f *Framework) WaitForPodNoLongerRunning(podName string) error { - return e2epod.WaitForPodNoLongerRunningInNamespace(f.ClientSet, podName, f.Namespace.Name) -} - // ClientConfig an externally accessible method for reading the kube client config. func (f *Framework) ClientConfig() *rest.Config { ret := rest.CopyConfig(f.clientConfig)