mirror of
https://github.com/containers/podman.git
synced 2025-06-25 20:26:51 +08:00
Fix podman pod unpaue TODO
Update the podman pod unpause to only show the paused containers with autocomplete. Fix a typo in the help command. Update the unpause function to only attempt an unpause on pasued pods instead of all the pods. Update the tests accordingly. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
This commit is contained in:
@ -56,7 +56,7 @@ var _ = Describe("Podman pod pause", func() {
|
||||
Expect(result).Should(Exit(0))
|
||||
})
|
||||
|
||||
It("podman pod pause a running pod by id", func() {
|
||||
It("pause a running pod by id", func() {
|
||||
_, ec, podid := podmanTest.CreatePod(nil)
|
||||
Expect(ec).To(Equal(0))
|
||||
|
||||
@ -73,11 +73,10 @@ var _ = Describe("Podman pod pause", func() {
|
||||
|
||||
result = podmanTest.Podman([]string{"pod", "unpause", podid})
|
||||
result.WaitWithDefaultTimeout()
|
||||
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
|
||||
})
|
||||
|
||||
It("podman unpause a running pod by id", func() {
|
||||
It("unpause a paused pod by id", func() {
|
||||
_, ec, podid := podmanTest.CreatePod(nil)
|
||||
Expect(ec).To(Equal(0))
|
||||
|
||||
@ -85,14 +84,21 @@ var _ = Describe("Podman pod pause", func() {
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
result := podmanTest.Podman([]string{"pod", "unpause", podid})
|
||||
result := podmanTest.Podman([]string{"pod", "pause", podid})
|
||||
result.WaitWithDefaultTimeout()
|
||||
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||
Expect(podmanTest.GetContainerStatus()).To(Equal(pausedState))
|
||||
|
||||
result = podmanTest.Podman([]string{"pod", "unpause", podid})
|
||||
result.WaitWithDefaultTimeout()
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
|
||||
})
|
||||
|
||||
It("podman pod pause a running pod by name", func() {
|
||||
It("unpause a paused pod by name", func() {
|
||||
_, ec, _ := podmanTest.CreatePod(map[string][]string{"--name": {"test1"}})
|
||||
Expect(ec).To(Equal(0))
|
||||
|
||||
@ -102,13 +108,42 @@ var _ = Describe("Podman pod pause", func() {
|
||||
|
||||
result := podmanTest.Podman([]string{"pod", "pause", "test1"})
|
||||
result.WaitWithDefaultTimeout()
|
||||
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||
Expect(podmanTest.GetContainerStatus()).To(Equal(pausedState))
|
||||
|
||||
result = podmanTest.Podman([]string{"pod", "unpause", "test1"})
|
||||
result.WaitWithDefaultTimeout()
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
|
||||
})
|
||||
|
||||
It("unpause --all", func() {
|
||||
_, ec, podid1 := podmanTest.CreatePod(nil)
|
||||
Expect(ec).To(Equal(0))
|
||||
_, ec, podid2 := podmanTest.CreatePod(nil)
|
||||
Expect(ec).To(Equal(0))
|
||||
|
||||
session := podmanTest.RunTopContainerInPod("", podid1)
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
session = podmanTest.RunTopContainerInPod("", podid2)
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
result := podmanTest.Podman([]string{"pod", "pause", podid1})
|
||||
result.WaitWithDefaultTimeout()
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
|
||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
||||
|
||||
result = podmanTest.Podman([]string{"pod", "unpause", "--all"})
|
||||
result.WaitWithDefaultTimeout()
|
||||
Expect(result).Should(Exit(0))
|
||||
Expect(result.OutputToStringArray()).Should(HaveLen(1))
|
||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(2))
|
||||
})
|
||||
})
|
||||
|
Reference in New Issue
Block a user