From 03e6622c926f4cb2425b84cb63b2ad8e4896fe2f Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 23 Jan 2026 17:47:17 -0500 Subject: [PATCH] Fix container_restart_test AfterEach failing when CRI Proxy is undefined Two test contexts were failing because their AfterEach blocks run even when BeforeEach skips the test (standard Ginkgo behavior). This caused resetCRIProxyInjector to fail with "CRI Proxy is undefined". Switched to using DeferCleanup inside BeforeEach instead, which only runs if BeforeEach succeeds. This is the same pattern the other test contexts in this file already use. Signed-off-by: Davanum Srinivas --- test/e2e_node/container_restart_test.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/test/e2e_node/container_restart_test.go b/test/e2e_node/container_restart_test.go index 710b6eafc0e..cddbbb0a236 100644 --- a/test/e2e_node/container_restart_test.go +++ b/test/e2e_node/container_restart_test.go @@ -100,11 +100,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial( if err := resetCRIProxyInjector(e2eCriProxy); err != nil { ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") } - }) - - ginkgo.AfterEach(func() { - err := resetCRIProxyInjector(e2eCriProxy) - framework.ExpectNoError(err) + ginkgo.DeferCleanup(func() error { + return resetCRIProxyInjector(e2eCriProxy) + }) }) ginkgo.It("Reduced default restart backs off.", func(ctx context.Context) { @@ -128,11 +126,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial( if err := resetCRIProxyInjector(e2eCriProxy); err != nil { ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") } - }) - - ginkgo.AfterEach(func() { - err := resetCRIProxyInjector(e2eCriProxy) - framework.ExpectNoError(err) + ginkgo.DeferCleanup(func() error { + return resetCRIProxyInjector(e2eCriProxy) + }) }) ginkgo.It("Reduced default restart backs off.", func(ctx context.Context) {