From 3a220be5bb3d7100c9b69eee4986c44f9f636873 Mon Sep 17 00:00:00 2001 From: Yiqiao Pu Date: Mon, 23 Apr 2018 17:14:22 +0800 Subject: Add start time check for restart test Check the start time changed after restart the container. Signed-off-by: Yiqiao Pu --- test/e2e/restart_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index ea03d022f..cae775cc1 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -36,10 +36,15 @@ var _ = Describe("Podman restart", func() { It("Podman restart stopped container by name", func() { _, exitCode, _ := podmanTest.RunLsContainer("test1") Expect(exitCode).To(Equal(0)) + startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) + startTime.WaitWithDefaultTimeout() session := podmanTest.Podman([]string{"restart", "test1"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) + restartTime.WaitWithDefaultTimeout() + Expect(restartTime.OutputToString()).To(Not(Equal(startTime.OutputToString()))) }) It("Podman restart stopped container by ID", func() { @@ -47,6 +52,8 @@ var _ = Describe("Podman restart", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() + startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", cid}) + startTime.WaitWithDefaultTimeout() startSession := podmanTest.Podman([]string{"start", cid}) startSession.WaitWithDefaultTimeout() @@ -55,16 +62,24 @@ var _ = Describe("Podman restart", func() { session2 := podmanTest.Podman([]string{"restart", cid}) session2.WaitWithDefaultTimeout() Expect(session2.ExitCode()).To(Equal(0)) + restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", cid}) + restartTime.WaitWithDefaultTimeout() + Expect(restartTime.OutputToString()).To(Not(Equal(startTime.OutputToString()))) }) It("Podman restart running container", func() { _ = podmanTest.RunTopContainer("test1") ok := WaitForContainer(&podmanTest) Expect(ok).To(BeTrue()) + startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) + startTime.WaitWithDefaultTimeout() session := podmanTest.Podman([]string{"restart", "--latest"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) + restartTime.WaitWithDefaultTimeout() + Expect(restartTime.OutputToString()).To(Not(Equal(startTime.OutputToString()))) }) It("Podman restart multiple containers", func() { @@ -73,9 +88,15 @@ var _ = Describe("Podman restart", func() { _, exitCode, _ = podmanTest.RunLsContainer("test2") Expect(exitCode).To(Equal(0)) + startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1", "test2"}) + startTime.WaitWithDefaultTimeout() session := podmanTest.Podman([]string{"restart", "test1", "test2"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1", "test2"}) + restartTime.WaitWithDefaultTimeout() + Expect(restartTime.OutputToStringArray()[0]).To(Not(Equal(startTime.OutputToStringArray()[0]))) + Expect(restartTime.OutputToStringArray()[1]).To(Not(Equal(startTime.OutputToStringArray()[1]))) }) }) -- cgit v1.2.3-54-g00ecf From 18c98375a08543d30b0371b8947aac347fc2e1c4 Mon Sep 17 00:00:00 2001 From: Yiqiao Pu Date: Mon, 23 Apr 2018 17:17:58 +0800 Subject: Improve restart latest container test Remove the --latest from the restart running container test, and add a separated case with following steps: start two container in order: test1, test2 restart container with --latest check the start time for test1 and test2 And the results should be test1 is not restarted and test2 is restarted. Signed-off-by: Yiqiao Pu --- test/e2e/restart_test.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index cae775cc1..46f950dd2 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -74,7 +74,7 @@ var _ = Describe("Podman restart", func() { startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) startTime.WaitWithDefaultTimeout() - session := podmanTest.Podman([]string{"restart", "--latest"}) + session := podmanTest.Podman([]string{"restart", "test1"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1"}) @@ -99,4 +99,23 @@ var _ = Describe("Podman restart", func() { Expect(restartTime.OutputToStringArray()[0]).To(Not(Equal(startTime.OutputToStringArray()[0]))) Expect(restartTime.OutputToStringArray()[1]).To(Not(Equal(startTime.OutputToStringArray()[1]))) }) + + It("Podman restart the latest container", func() { + _, exitCode, _ := podmanTest.RunLsContainer("test1") + Expect(exitCode).To(Equal(0)) + + _, exitCode, _ = podmanTest.RunLsContainer("test2") + Expect(exitCode).To(Equal(0)) + + startTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1", "test2"}) + startTime.WaitWithDefaultTimeout() + + session := podmanTest.Podman([]string{"restart", "-l"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + restartTime := podmanTest.Podman([]string{"inspect", "--format='{{.State.StartedAt}}'", "test1", "test2"}) + restartTime.WaitWithDefaultTimeout() + Expect(restartTime.OutputToStringArray()[0]).To(Equal(startTime.OutputToStringArray()[0])) + Expect(restartTime.OutputToStringArray()[1]).To(Not(Equal(startTime.OutputToStringArray()[1]))) + }) }) -- cgit v1.2.3-54-g00ecf From 04b58bc80cf58390d0923a4aff84ff07eef34d23 Mon Sep 17 00:00:00 2001 From: Yiqiao Pu Date: Mon, 23 Apr 2018 17:21:23 +0800 Subject: Add restart test with timeout Test the --timeout flag with a container which can not be stopped with SIGSTOP. This means the container should can not be stopped and will be killed then restart with timeout value. Test steps: Start a container with STOPSIGNAL=SIGKILL Restart it with --timeout set to 2s Check the restart command will finished more than 2s and less than 10s(the default timeout) Signed-off-by: Yiqiao Pu --- test/e2e/restart_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 46f950dd2..812ba5ac9 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -2,6 +2,7 @@ package integration import ( "os" + "time" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -118,4 +119,17 @@ var _ = Describe("Podman restart", func() { Expect(restartTime.OutputToStringArray()[0]).To(Equal(startTime.OutputToStringArray()[0])) Expect(restartTime.OutputToStringArray()[1]).To(Not(Equal(startTime.OutputToStringArray()[1]))) }) + + It("Podman restart non-stop container with short timeout", func() { + session := podmanTest.Podman([]string{"run", "-d", "--name", "test1", "--env", "STOPSIGNAL=SIGKILL", ALPINE, "sleep", "999"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + startTime := time.Now() + session = podmanTest.Podman([]string{"restart", "-t", "2", "test1"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + timeSince := time.Since(startTime) + Expect(timeSince < 10*time.Second).To(BeTrue()) + Expect(timeSince > 2*time.Second).To(BeTrue()) + }) }) -- cgit v1.2.3-54-g00ecf