diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 6327e6504d0..3d3c1386242 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -515,11 +515,6 @@ func (f *Framework) WaitForPodTerminated(podName, reason string) error { return e2epod.WaitForPodTerminatedInNamespace(f.ClientSet, podName, reason, f.Namespace.Name) } -// WaitForPodNotFound waits for the pod to be completely terminated (not "Get-able"). -func (f *Framework) WaitForPodNotFound(podName string, timeout time.Duration) error { - return e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, podName, f.Namespace.Name, timeout) -} - // WaitForPodReady waits for the pod to flip to ready in the namespace. func (f *Framework) WaitForPodReady(podName string) error { return e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, f.Namespace.Name, PodStartTimeout) diff --git a/test/e2e/network/network_policy.go b/test/e2e/network/network_policy.go index f0d5ac74362..9e6bb147e6d 100644 --- a/test/e2e/network/network_policy.go +++ b/test/e2e/network/network_policy.go @@ -718,15 +718,15 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() { framework.ExpectNoError(err, "Error creating Network Policy %v: %v", policy.ObjectMeta.Name, err) testCanConnect(f, f.Namespace, "client-a", service, clientAAllowedPort) - err = f.WaitForPodNotFound("client-a", framework.PodDeleteTimeout) + e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, "client-a", f.Namespace.Name, framework.PodDeleteTimeout) framework.ExpectNoError(err, "Expected pod to be not found.") testCannotConnect(f, f.Namespace, "client-b", service, clientAAllowedPort) - err = f.WaitForPodNotFound("client-b", framework.PodDeleteTimeout) + e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, "client-b", f.Namespace.Name, framework.PodDeleteTimeout) framework.ExpectNoError(err, "Expected pod to be not found.") testCannotConnect(f, f.Namespace, "client-a", service, clientANotAllowedPort) - err = f.WaitForPodNotFound("client-a", framework.PodDeleteTimeout) + e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, "client-a", f.Namespace.Name, framework.PodDeleteTimeout) framework.ExpectNoError(err, "Expected pod to be not found.") const ( @@ -765,7 +765,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() { defer cleanupNetworkPolicy(f, policy) testCannotConnect(f, f.Namespace, "client-b", service, clientBNotAllowedPort) - err = f.WaitForPodNotFound("client-b", framework.PodDeleteTimeout) + e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, "client-b", f.Namespace.Name, framework.PodDeleteTimeout) framework.ExpectNoError(err, "Expected pod to be not found.") testCannotConnect(f, f.Namespace, "client-a", service, clientBNotAllowedPort) diff --git a/test/e2e/storage/utils/utils.go b/test/e2e/storage/utils/utils.go index b6e956e8347..68937fc0d80 100644 --- a/test/e2e/storage/utils/utils.go +++ b/test/e2e/storage/utils/utils.go @@ -307,7 +307,7 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f ginkgo.By("Starting the kubelet and waiting for pod to delete.") KubeletCommand(KStart, c, clientPod) - err = f.WaitForPodNotFound(clientPod.Name, framework.PodDeleteTimeout) + err = e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, clientPod.Name, f.Namespace.Name, framework.PodDeleteTimeout) if err != nil { framework.ExpectNoError(err, "Expected pod to be not found.") } @@ -393,7 +393,7 @@ func TestVolumeUnmapsFromDeletedPodWithForceOption(c clientset.Interface, f *fra ginkgo.By("Starting the kubelet and waiting for pod to delete.") KubeletCommand(KStart, c, clientPod) - err = f.WaitForPodNotFound(clientPod.Name, framework.PodDeleteTimeout) + err = e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, clientPod.Name, f.Namespace.Name, framework.PodDeleteTimeout) framework.ExpectNoError(err, "Expected pod to be not found.") if forceDelete {