2 files changed, 59 insertions, 6 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index d164b6021..3a1da5d8c 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -62,6 +62,42 @@ var _ = Describe("Podman generate systemd", func() {
 		Expect(session.ErrorToString()).To(ContainSubstring("bogus is not a valid restart policy"))
 	})
 
+	It("podman generate systemd with --no-header=true", func() {
+		session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"generate", "systemd", "foobar", "--no-header=true"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		Expect(session.OutputToString()).NotTo(ContainSubstring("autogenerated by"))
+	})
+
+	It("podman generate systemd with --no-header", func() {
+		session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"generate", "systemd", "foobar", "--no-header"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		Expect(session.OutputToString()).NotTo(ContainSubstring("autogenerated by"))
+	})
+
+	It("podman generate systemd with --no-header=false", func() {
+		session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"generate", "systemd", "foobar", "--no-header=false"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		Expect(session.OutputToString()).To(ContainSubstring("autogenerated by"))
+	})
+
 	It("podman generate systemd good timeout value", func() {
 		session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/test.yaml b/test/system/700-play.bats
index 98d2c91df..e7904f59f 100644
--- a/test/e2e/test.yaml
+++ b/test/system/700-play.bats
@@ -1,13 +1,17 @@
-# Save the output of this file and use kubectl create -f to import
-# it into Kubernetes.
+#!/usr/bin/env bats   -*- bats -*-
 #
-# Created with podman-1.6.2
+# Test podman play
+#
+
+load helpers
+
+testYaml="
 apiVersion: v1
 kind: Pod
 metadata:
   labels:
     app: test
-  name: test
+  name: test_pod
 spec:
   containers:
   - command:
@@ -20,7 +24,7 @@ spec:
       value: xterm
     - name: container
       value: podman
-    image: docker.io/library/fedora:latest
+    image: quay.io/libpod/alpine:latest
     name: test
     resources: {}
     securityContext:
@@ -31,7 +35,20 @@ spec:
       capabilities: {}
       privileged: false
       seLinuxOptions:
-	  level: "s0:c1,c2"
+         level: "s0:c1,c2"
       readOnlyRootFilesystem: false
     workingDir: /
 status: {}
+"
+
+@test "podman play with stdin" {
+    echo "$testYaml" > $PODMAN_TMPDIR/test.yaml
+    run_podman play kube - < $PODMAN_TMPDIR/test.yaml
+    run_podman pod rm -f test_pod
+}
+
+@test "podman play" {
+    echo "$testYaml" > $PODMAN_TMPDIR/test.yaml
+    run_podman play kube $PODMAN_TMPDIR/test.yaml
+    run_podman pod rm -f test_pod
+}