diff options
| author | Jhon Honce <jhonce@redhat.com> | 2019-03-04 11:55:23 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2019-03-04 12:20:37 -0700 |
| commit | ae47a7c47e103f22e557de394342054ca801168c (patch) | |
| tree | b57ab3be002a800ee2c2f768f67e2844cb6d1c3b /test | |
| parent | 54eecb02f050d743c7a00f5d8e2e8ffbdc26d568 (diff) | |
| download | podman-ae47a7c47e103f22e557de394342054ca801168c.tar.gz podman-ae47a7c47e103f22e557de394342054ca801168c.tar.bz2 podman-ae47a7c47e103f22e557de394342054ca801168c.zip | |
Fix #2521
* Bad merge against podman stop, restored overwritten code
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/stop_test.go | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index eb680d2a1..cd0d804ee 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -82,7 +82,7 @@ var _ = Describe("Podman stop", func() { Expect(session3.ExitCode()).To(Equal(0)) }) - It("podman stop all containers", func() { + It("podman stop all containers -t", func() { session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -107,6 +107,32 @@ var _ = Describe("Podman stop", func() { Expect(output).To(ContainSubstring(cid3)) }) + It("podman stop container --time", func() { + session := podmanTest.RunTopContainer("test4") + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + cid1 := session.OutputToString() + + session = podmanTest.Podman([]string{"stop", "--time", "1", "test4"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + output := session.OutputToString() + Expect(output).To(ContainSubstring(cid1)) + }) + + It("podman stop container --timeout", func() { + session := podmanTest.RunTopContainer("test5") + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + cid1 := session.OutputToString() + + session = podmanTest.Podman([]string{"stop", "--timeout", "1", "test5"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + output := session.OutputToString() + Expect(output).To(ContainSubstring(cid1)) + }) + It("podman stop latest containers", func() { session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() |