From 1e99621f00c08f99000f81fd01b6d00a6df5734c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 5 May 2023 14:00:12 -0400 Subject: [PATCH] Revert "ginkgo-v2 cleanup workaround for #18180" This reverts commit c4b9f4b34e75da3df5b40fd8e8d42dde224cbd1c. This was a temporary workaround until a fix for #18180 landed. Signed-off-by: Matthew Heon --- test/e2e/common_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 2b71e79c4e29..697522b2f061 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -652,12 +652,7 @@ func (p *PodmanTestIntegration) Cleanup() { // An error would cause it to stop and return early otherwise. Expect(stop).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", stop.Command.Args, stop.OutputToString(), stop.ErrorToString()) Expect(podrm).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", podrm.Command.Args, podrm.OutputToString(), podrm.ErrorToString()) - - // FIXME: Remove this special case when the issue is fixed. - // Special case rm -fa is not working correctly with dependencies, https://github.com/containers/podman/issues/18180 - if !strings.Contains(rmall.ErrorToString(), "has dependent containers which must be removed before it") { - Expect(rmall).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", rmall.Command.Args, rmall.OutputToString(), rmall.ErrorToString()) - } + Expect(rmall).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", rmall.Command.Args, rmall.OutputToString(), rmall.ErrorToString()) } // CleanupVolume cleans up the volumes and containers.