2 files changed, 99 insertions, 1 deletions
diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go
new file mode 100644
index 000000000..ea03d022f
--- /dev/null
+++ b/test/e2e/restart_test.go
@@ -0,0 +1,81 @@
+package integration
+
+import (
+	"os"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Podman restart", func() {
+	var (
+		tempdir    string
+		err        error
+		podmanTest PodmanTest
+	)
+
+	BeforeEach(func() {
+		tempdir, err = CreateTempDirInTempDir()
+		if err != nil {
+			os.Exit(1)
+		}
+		podmanTest = PodmanCreate(tempdir)
+		podmanTest.RestoreAllArtifacts()
+	})
+
+	AfterEach(func() {
+		podmanTest.Cleanup()
+	})
+
+	It("Podman restart bogus container", func() {
+		session := podmanTest.Podman([]string{"start", "123"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+	})
+
+	It("Podman restart stopped container by name", func() {
+		_, exitCode, _ := podmanTest.RunLsContainer("test1")
+		Expect(exitCode).To(Equal(0))
+
+		session := podmanTest.Podman([]string{"restart", "test1"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
+
+	It("Podman restart stopped container by ID", func() {
+		session := podmanTest.Podman([]string{"create", "-d", ALPINE, "ls"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		cid := session.OutputToString()
+
+		startSession := podmanTest.Podman([]string{"start", cid})
+		startSession.WaitWithDefaultTimeout()
+		Expect(startSession.ExitCode()).To(Equal(0))
+
+		session2 := podmanTest.Podman([]string{"restart", cid})
+		session2.WaitWithDefaultTimeout()
+		Expect(session2.ExitCode()).To(Equal(0))
+	})
+
+	It("Podman restart running container", func() {
+		_ = podmanTest.RunTopContainer("test1")
+		ok := WaitForContainer(&podmanTest)
+		Expect(ok).To(BeTrue())
+
+		session := podmanTest.Podman([]string{"restart", "--latest"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
+
+	It("Podman restart multiple containers", func() {
+		_, exitCode, _ := podmanTest.RunLsContainer("test1")
+		Expect(exitCode).To(Equal(0))
+
+		_, exitCode, _ = podmanTest.RunLsContainer("test2")
+		Expect(exitCode).To(Equal(0))
+
+		session := podmanTest.Podman([]string{"restart", "test1", "test2"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
+})
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index 910656ef0..1404312d9 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -59,7 +59,7 @@ var _ = Describe("Podman rm", func() {
 		Expect(result.ExitCode()).To(Equal(0))
 	})
 
-	It("podman rm created container", func() {
+	It("podman rm running container with -f", func() {
 		session := podmanTest.RunTopContainer("")
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -105,4 +105,21 @@ var _ = Describe("Podman rm", func() {
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
+
+	It("podman rm the latest container", func() {
+		session := podmanTest.Podman([]string{"create", ALPINE, "ls"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		_, ec, cid := podmanTest.RunLsContainer("")
+		Expect(ec).To(Equal(0))
+
+		result := podmanTest.Podman([]string{"rm", "-l"})
+		result.WaitWithDefaultTimeout()
+		Expect(result.ExitCode()).To(Equal(0))
+		output := result.OutputToString()
+		Expect(output).To(ContainSubstring(cid))
+		Expect(podmanTest.NumberOfContainers()).To(Equal(1))
+
+	})
 })