diff options
author | haircommander <pehunt@redhat.com> | 2018-07-27 13:58:50 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
commit | d5e690914dc78eca8664442e7677eb5004522bfd (patch) | |
tree | 3f7ed30e4302c871c16126a0032b8a3d51c46f98 /test/e2e/pod_restart_test.go | |
parent | 63dd200e7e47261454c7e55fed2ad972144e147f (diff) | |
download | podman-d5e690914dc78eca8664442e7677eb5004522bfd.tar.gz podman-d5e690914dc78eca8664442e7677eb5004522bfd.tar.bz2 podman-d5e690914dc78eca8664442e7677eb5004522bfd.zip |
Added option to share kernel namespaces in libpod and podman
A pause container is added to the pod if the user opts in. The default pause image and command can be overridden. Pause containers are ignored in ps unless the -a option is present. Pod inspect and pod ps show shared namespaces and pause container. A pause container can't be removed with podman rm, and a pod can be removed if it only has a pause container.
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'test/e2e/pod_restart_test.go')
-rw-r--r-- | test/e2e/pod_restart_test.go | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 86132c04f..e486f8791 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -38,22 +38,19 @@ var _ = Describe("Podman pod restart", func() { }) It("podman pod restart single empty pod", func() { - session := podmanTest.Podman([]string{"pod", "create"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - cid := session.OutputToString() + _, ec, podid := podmanTest.CreatePod("") + Expect(ec).To(Equal(0)) - session = podmanTest.Podman([]string{"pod", "restart", cid}) + session := podmanTest.Podman([]string{"pod", "restart", podid}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) }) It("podman pod restart single pod by name", func() { - session := podmanTest.Podman([]string{"pod", "create", "--name", "foobar99"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + _, ec, _ := podmanTest.CreatePod("foobar99") + Expect(ec).To(Equal(0)) - session = podmanTest.RunTopContainerInPod("test1", "foobar99") + session := podmanTest.RunTopContainerInPod("test1", "foobar99") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -70,15 +67,15 @@ var _ = Describe("Podman pod restart", func() { }) It("podman pod restart multiple pods", func() { - session := podmanTest.Podman([]string{"pod", "create", "--name", "foobar99"}) - session.WaitWithDefaultTimeout() + _, ec, _ := podmanTest.CreatePod("foobar99") + Expect(ec).To(Equal(0)) - session = podmanTest.RunTopContainerInPod("test1", "foobar99") + session := podmanTest.RunTopContainerInPod("test1", "foobar99") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session2 := podmanTest.Podman([]string{"pod", "create", "--name", "foobar100"}) - session2.WaitWithDefaultTimeout() + _, ec, _ = podmanTest.CreatePod("foobar100") + Expect(ec).To(Equal(0)) session = podmanTest.RunTopContainerInPod("test2", "foobar100") session.WaitWithDefaultTimeout() @@ -108,15 +105,15 @@ var _ = Describe("Podman pod restart", func() { }) It("podman pod restart all pods", func() { - session := podmanTest.Podman([]string{"pod", "create", "--name", "foobar99"}) - session.WaitWithDefaultTimeout() + _, ec, _ := podmanTest.CreatePod("foobar99") + Expect(ec).To(Equal(0)) - session = podmanTest.RunTopContainerInPod("test1", "foobar99") + session := podmanTest.RunTopContainerInPod("test1", "foobar99") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session2 := podmanTest.Podman([]string{"pod", "create", "--name", "foobar100"}) - session2.WaitWithDefaultTimeout() + _, ec, _ = podmanTest.CreatePod("foobar100") + Expect(ec).To(Equal(0)) session = podmanTest.RunTopContainerInPod("test2", "foobar100") session.WaitWithDefaultTimeout() @@ -136,15 +133,15 @@ var _ = Describe("Podman pod restart", func() { }) It("podman pod restart latest pod", func() { - session := podmanTest.Podman([]string{"pod", "create", "--name", "foobar99"}) - session.WaitWithDefaultTimeout() + _, ec, _ := podmanTest.CreatePod("foobar99") + Expect(ec).To(Equal(0)) - session = podmanTest.RunTopContainerInPod("test1", "foobar99") + session := podmanTest.RunTopContainerInPod("test1", "foobar99") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session2 := podmanTest.Podman([]string{"pod", "create", "--name", "foobar100"}) - session2.WaitWithDefaultTimeout() + _, ec, _ = podmanTest.CreatePod("foobar100") + Expect(ec).To(Equal(0)) session = podmanTest.RunTopContainerInPod("test2", "foobar100") session.WaitWithDefaultTimeout() @@ -164,15 +161,14 @@ var _ = Describe("Podman pod restart", func() { }) It("podman pod restart multiple pods with bogus", func() { - session := podmanTest.Podman([]string{"pod", "create", "--name", "foobar99"}) - session.WaitWithDefaultTimeout() - cid1 := session.OutputToString() + _, ec, podid1 := podmanTest.CreatePod("foobar99") + Expect(ec).To(Equal(0)) - session = podmanTest.RunTopContainerInPod("", "foobar99") + session := podmanTest.RunTopContainerInPod("", "foobar99") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session = podmanTest.Podman([]string{"pod", "restart", cid1, "doesnotexist"}) + session = podmanTest.Podman([]string{"pod", "restart", podid1, "doesnotexist"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) }) |