4 files changed, 57 insertions, 2 deletions
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index 046297bc0..c960fb311 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -41,7 +41,7 @@ var _ = Describe("Podman Info", func() {
 	})
 	It("podman system info json output", func() {
 		session := podmanTest.Podman([]string{"system", "info", "--format=json"})
-		session.Wait()
+		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 
 	})
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index b7d959de9..d383a83b3 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"os"
+	"strings"
 
 	. "github.com/containers/libpod/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -34,7 +35,6 @@ var _ = Describe("Podman logs", func() {
 
 	})
 
-	//sudo bin/podman run -it --rm fedora-minimal bash -c 'for a in `seq 5`; do echo hello; done'
 	It("podman logs for container", func() {
 		logc := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
 		logc.WaitWithDefaultTimeout()
@@ -106,4 +106,30 @@ var _ = Describe("Podman logs", func() {
 		Expect(results.ExitCode()).To(Equal(0))
 		Expect(len(results.OutputToStringArray())).To(Equal(3))
 	})
+
+	It("podman logs latest and container name should fail", func() {
+		results := podmanTest.Podman([]string{"logs", "-l", "foobar"})
+		results.WaitWithDefaultTimeout()
+		Expect(results.ExitCode()).ToNot(Equal(0))
+	})
+
+	It("podman logs two containers and should display short container IDs", func() {
+		log1 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
+		log1.WaitWithDefaultTimeout()
+		Expect(log1.ExitCode()).To(Equal(0))
+		cid1 := log1.OutputToString()
+
+		log2 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
+		log2.WaitWithDefaultTimeout()
+		Expect(log2.ExitCode()).To(Equal(0))
+		cid2 := log2.OutputToString()
+
+		results := podmanTest.Podman([]string{"logs", cid1, cid2})
+		results.WaitWithDefaultTimeout()
+		Expect(results.ExitCode()).To(Equal(0))
+
+		output := results.OutputToStringArray()
+		Expect(len(output)).To(Equal(6))
+		Expect(strings.Contains(output[0], cid1[:12]) || strings.Contains(output[0], cid2[:12])).To(BeTrue())
+	})
 })
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 58697acde..92ca538f0 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -303,4 +303,18 @@ var _ = Describe("Podman ps", func() {
 		Expect(session.OutputToString()).To(ContainSubstring(podid))
 
 	})
+
+	It("podman ps test with port range", func() {
+		session := podmanTest.RunTopContainer("")
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"run", "-dt", "-p", "1000-1006:1000-1006", ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"ps", "--format", "{{.Ports}}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.OutputToString()).To(ContainSubstring("0.0.0.0:1000-1006"))
+	})
 })
diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go
index cd771e2ba..57146bca0 100644
--- a/test/e2e/rootless_test.go
+++ b/test/e2e/rootless_test.go
@@ -138,6 +138,21 @@ var _ = Describe("Podman rootless", func() {
 			cmd.WaitWithDefaultTimeout()
 			Expect(cmd.ExitCode()).To(Equal(0))
 			Expect(cmd.LineInOutputContains("hello")).To(BeTrue())
+
+			args = []string{"pod", "top", podId}
+			cmd = rootlessTest.PodmanAsUser(args, 1000, 1000, "", env)
+			cmd.WaitWithDefaultTimeout()
+			Expect(cmd.ExitCode()).To(Not(Equal(0)))
+
+			args = []string{"run", "--pod", podId, "-d", "--rootfs", mountPath, "sleep", "100"}
+			cmd = rootlessTest.PodmanAsUser(args, 1000, 1000, "", env)
+			cmd.WaitWithDefaultTimeout()
+			Expect(cmd.ExitCode()).To(Equal(0))
+
+			args = []string{"pod", "top", podId}
+			cmd = rootlessTest.PodmanAsUser(args, 1000, 1000, "", env)
+			cmd.WaitWithDefaultTimeout()
+			Expect(cmd.ExitCode()).To(Equal(0))
 		}
 		runInRootlessContext(f)
 	})