2 files changed, 61 insertions, 1 deletions
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
new file mode 100644
index 000000000..cea457ae4
--- /dev/null
+++ b/test/e2e/run_passwd_test.go
@@ -0,0 +1,60 @@
+package integration
+
+import (
+	"os"
+
+	"fmt"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Podman run passwd", 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()
+		f := CurrentGinkgoTestDescription()
+		timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds())
+		GinkgoWriter.Write([]byte(timedResult))
+	})
+
+	It("podman run no user specified ", func() {
+		session := podmanTest.Podman([]string{"run", ALPINE, "mount"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+	})
+	It("podman run user specified in container", func() {
+		session := podmanTest.Podman([]string{"run", "-u", "bin", ALPINE, "mount"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+	})
+
+	It("podman run UID specified in container", func() {
+		session := podmanTest.Podman([]string{"run", "-u", "2:1", ALPINE, "mount"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+	})
+
+	It("podman run UID not specified in container", func() {
+		session := podmanTest.Podman([]string{"run", "-u", "20001:1", ALPINE, "mount"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContains("passwd")).To(BeTrue())
+	})
+})
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index a443d4ca5..271651056 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -401,7 +401,7 @@ var _ = Describe("Podman run", func() {
 		session := podmanTest.Podman([]string{"run", "--rm", "--user=1234", ALPINE, "id"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
-		Expect(session.OutputToString()).To(Equal("uid=1234 gid=0(root)"))
+		Expect(session.OutputToString()).To(Equal("uid=1234(1234) gid=0(root)"))
 	})
 
 	It("podman run with user (integer, in /etc/passwd)", func() {