From 4e6efbbbb3f60dcaa17cc283388628c2159dae9a Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 9 May 2023 13:12:37 -0400 Subject: [PATCH] Revert "test/e2e: fix "podman run ipcns ipcmk container test"" This reverts commit 9bd833bcfd07bf2b3c258a617d88255327b91669. With the fix for `podman rm -fa` merged, we no longer require this patch. Signed-off-by: Matthew Heon --- test/e2e/run_ns_test.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 53c3645f4e..dfb56f45bd 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -63,7 +63,7 @@ var _ = Describe("Podman run ns", func() { }) It("podman run ipcns ipcmk container test", func() { - setup := podmanTest.Podman([]string{"run", "-d", "--name", "test1", fedoraMinimal, "sleep", "30"}) + setup := podmanTest.Podman([]string{"run", "-d", "--name", "test1", fedoraMinimal, "sleep", "999"}) setup.WaitWithDefaultTimeout() Expect(setup).Should(Exit(0)) @@ -72,12 +72,7 @@ var _ = Describe("Podman run ns", func() { Expect(session).Should(Exit(0)) output := strings.Split(session.OutputToString(), " ") ipc := output[len(output)-1] - session = podmanTest.Podman([]string{"run", "--name=t2", "--ipc=container:test1", fedoraMinimal, "ipcs", "-m", "-i", ipc}) - session.WaitWithDefaultTimeout() - Expect(session).Should(Exit(0)) - - // We have to remove the dependency container first, rm --all fails in the cleanup because of the unknown ordering. - session = podmanTest.Podman([]string{"rm", "t2"}) + session = podmanTest.Podman([]string{"run", "--ipc=container:test1", fedoraMinimal, "ipcs", "-m", "-i", ipc}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) })