diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index c68b9df5b9..7cdfe5af0f 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -27,27 +27,6 @@ func getRunString(input []string) []string { return append(runString, input...) } -// FIXME FIXME FIXME: workaround for #14653, please remove this function -// and all calls to it once that bug is fixed. -func fixmeFixme14653(podmanTest *PodmanTestIntegration, cid string) { - if !IsRemote() { - // Race condition only affects podman-remote - return - } - - // Wait for container to truly go away - for i := 0; i < 5; i++ { - ps := podmanTest.Podman([]string{"container", "exists", cid}) - ps.WaitWithDefaultTimeout() - if ps.ExitCode() == 1 { - // yay, it's gone - return - } - time.Sleep(time.Second) - } - // Fall through. Container still exists, but return anyway. -} - var _ = Describe("Podman checkpoint", func() { var ( tempdir string @@ -534,7 +513,6 @@ var _ = Describe("Podman checkpoint", func() { // As the container has been started with '--rm' it will be completely // cleaned up after checkpointing. Expect(result).Should(Exit(0)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -588,7 +566,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -608,7 +585,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -628,7 +604,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -648,7 +623,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -712,7 +686,6 @@ var _ = Describe("Podman checkpoint", func() { Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -763,7 +736,6 @@ var _ = Describe("Podman checkpoint", func() { Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -806,7 +778,6 @@ var _ = Describe("Podman checkpoint", func() { Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -845,7 +816,6 @@ var _ = Describe("Podman checkpoint", func() { Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -896,7 +866,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -967,7 +936,6 @@ var _ = Describe("Podman checkpoint", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1118,7 +1086,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1215,7 +1182,6 @@ var _ = Describe("Podman checkpoint", func() { // As the container has been started with '--rm' it will be completely // cleaned up after checkpointing. Expect(result).To(Exit(0)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) Expect(podmanTest.NumberOfContainers()).To(Equal(1)) @@ -1329,7 +1295,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1374,7 +1339,6 @@ var _ = Describe("Podman checkpoint", func() { // As the container has been started with '--rm' it will be completely // cleaned up after checkpointing. Expect(result).Should(Exit(0)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1563,7 +1527,6 @@ var _ = Describe("Podman checkpoint", func() { // As the container has been started with '--rm' it will be completely // cleaned up after checkpointing. Expect(result).Should(Exit(0)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1661,7 +1624,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(session).Should(Exit(0)) Expect(session.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1736,7 +1698,6 @@ var _ = Describe("Podman checkpoint", func() { // As the container has been started with '--rm' it will be completely // cleaned up after checkpointing. Expect(result).Should(Exit(0)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) @@ -1816,7 +1777,6 @@ var _ = Describe("Podman checkpoint", func() { // cleaned up after checkpointing. Expect(result).Should(Exit(0)) Expect(result.OutputToString()).To(ContainSubstring(cid)) - fixmeFixme14653(podmanTest, cid) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))