7 files changed, 92 insertions, 3 deletions
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 597d0aef7..f7596d77d 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -184,4 +184,25 @@ var _ = Describe("Podman cp", func() {
 		_, err = os.Stat("/tmp/cp_test.txt")
 		Expect(err).To(Not(BeNil()))
 	})
+	It("podman cp volume", func() {
+		session := podmanTest.Podman([]string{"volume", "create", "data"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"create", "-v", "data:/data", "--name", "container1", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		err = ioutil.WriteFile("cp_vol", []byte("copy to the volume"), 0644)
+		if err != nil {
+			os.Exit(1)
+		}
+		session = podmanTest.Podman([]string{"cp", "cp_vol", "container1" + ":/data/cp_vol1"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"cp", "container1" + ":/data/cp_vol1", "cp_vol2"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
 })
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 95d46476d..40cc534c2 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"os"
+	"path/filepath"
 
 	. "github.com/containers/libpod/test/utils"
 	"github.com/ghodss/yaml"
@@ -104,4 +105,43 @@ var _ = Describe("Podman generate kube", func() {
 		_, err := yaml.Marshal(kube.OutputToString())
 		Expect(err).To(BeNil())
 	})
+
+	It("podman generate and reimport kube on pod", func() {
+		podName := "toppod"
+		_, rc, _ := podmanTest.CreatePod(podName)
+		Expect(rc).To(Equal(0))
+
+		session := podmanTest.Podman([]string{"create", "--pod", podName, "--name", "test1", ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session2 := podmanTest.Podman([]string{"create", "--pod", podName, "--name", "test2", ALPINE, "top"})
+		session2.WaitWithDefaultTimeout()
+		Expect(session2.ExitCode()).To(Equal(0))
+
+		outputFile := filepath.Join(podmanTest.RunRoot, "pod.yaml")
+		kube := podmanTest.Podman([]string{"generate", "kube", "-f", outputFile, podName})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		session3 := podmanTest.Podman([]string{"pod", "rm", "-af"})
+		session3.WaitWithDefaultTimeout()
+		Expect(session3.ExitCode()).To(Equal(0))
+
+		session4 := podmanTest.Podman([]string{"play", "kube", outputFile})
+		session4.WaitWithDefaultTimeout()
+		Expect(session4.ExitCode()).To(Equal(0))
+
+		session5 := podmanTest.Podman([]string{"pod", "ps"})
+		session5.WaitWithDefaultTimeout()
+		Expect(session5.ExitCode()).To(Equal(0))
+		Expect(session5.OutputToString()).To(ContainSubstring(podName))
+
+		session6 := podmanTest.Podman([]string{"ps", "-a"})
+		session6.WaitWithDefaultTimeout()
+		Expect(session6.ExitCode()).To(Equal(0))
+		psOut := session6.OutputToString()
+		Expect(psOut).To(ContainSubstring("test1"))
+		Expect(psOut).To(ContainSubstring("test2"))
+	})
 })
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index cc50c4d95..d17f60a5d 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -218,4 +218,21 @@ var _ = Describe("Podman logs", func() {
 		Expect(results.ExitCode()).To(Equal(0))
 		Expect(len(results.OutputToStringArray())).To(Equal(3))
 	})
+
+	It("podman logs -f two lines", func() {
+		containerName := "logs-f-rm"
+
+		logc := podmanTest.Podman([]string{"run", "--rm", "--name", containerName, "-dt", ALPINE, "sh", "-c", "echo podman; sleep 1; echo podman"})
+		logc.WaitWithDefaultTimeout()
+		Expect(logc.ExitCode()).To(Equal(0))
+
+		results := podmanTest.Podman([]string{"logs", "-f", containerName})
+		results.WaitWithDefaultTimeout()
+		Expect(results.ExitCode()).To(Equal(0))
+
+		// Verify that the cleanup process worked correctly and we can recreate a container with the same name
+		logc = podmanTest.Podman([]string{"run", "--rm", "--name", containerName, "-dt", ALPINE, "true"})
+		logc.WaitWithDefaultTimeout()
+		Expect(logc.ExitCode()).To(Equal(0))
+	})
 })
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 31720ea04..3ba3c2bb3 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -659,6 +659,14 @@ USER mail`
 		Expect(isSharedOnly).Should(BeTrue())
 	})
 
+	It("podman run --mount type=bind,bind-nonrecursive", func() {
+		SkipIfRootless()
+		session := podmanTest.Podman([]string{"run", "--mount", "type=bind,bind-nonrecursive,slave,src=/,target=/host", fedoraMinimal, "findmnt", "-nR", "/host"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(len(session.OutputToStringArray())).To(Equal(1))
+	})
+
 	It("podman run --pod automatically", func() {
 		session := podmanTest.Podman([]string{"run", "--pod", "new:foobar", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index 5ef68603e..4e2cb501e 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -85,6 +85,7 @@ var _ = Describe("podman container runlabel", func() {
 	})
 
 	It("podman container runlabel global options", func() {
+		Skip("Test nonfunctional for podman-in-podman testing")
 		image := "podman-global-test:ls"
 		podmanTest.BuildImage(GlobalDockerfile, image, "false")
 		result := podmanTest.Podman([]string{"--syslog", "--log-level", "debug", "container", "runlabel", "RUN", image})
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index 47c7a52fc..0068e35a9 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -14,7 +14,7 @@ Distribution:
 OCIRuntime:\\\s\\\+package:
 os:
 rootless:
-insecure registries:
+registries:
 store:
 GraphDriverName:
 GraphRoot:
@@ -37,9 +37,7 @@ RunRoot:
 
     tests="
 host.BuildahVersion       | [0-9.]
-host.Conmon.package       | $expr_nvr
 host.Conmon.path          | $expr_path
-host.OCIRuntime.package   | $expr_nvr
 host.OCIRuntime.path      | $expr_path
 store.ConfigFile          | $expr_path
 store.GraphDriverName     | [a-z0-9]\\\+\\\$
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index dedfe6172..f2dedb73f 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -87,6 +87,10 @@ verify_iid_and_name() {
 
 
 @test "podman load - will not read from tty" {
+    if [ ! -t 0 ]; then
+        skip "STDIN is not a tty"
+    fi
+
     run_podman 125 load
     is "$output" \
        "Error: cannot read from terminal. Use command-line redirection" \