6 files changed, 97 insertions, 0 deletions
diff --git a/test/e2e/build/Dockerfile.test-cp-root-dir b/test/e2e/build/Dockerfile.test-cp-root-dir
new file mode 100644
index 000000000..9f7de7c32
--- /dev/null
+++ b/test/e2e/build/Dockerfile.test-cp-root-dir
@@ -0,0 +1,2 @@
+FROM scratch
+COPY Dockerfile.test-cp-root-dir /
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 6ae54ba34..3f9b12e0a 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -296,4 +296,42 @@ var _ = Describe("Podman cp", func() {
 
 		os.Remove("testfile1")
 	})
+	It("podman cp the root directory from the ctr to an existing directory on the host ", func() {
+		imgName := "test-cp-root-dir:latest"
+		DockerfileName := "Dockerfile.test-cp-root-dir"
+		ctrName := "test-container-cp-root"
+
+		session := podmanTest.PodmanNoCache([]string{"build", "-f", "build/" + DockerfileName, "-t", imgName, "build/"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		testDirPath := filepath.Join(podmanTest.RunRoot, "TestDirForCp")
+
+		session = podmanTest.Podman([]string{"create", "--name", ctrName, imgName, "dummy"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		err := os.Mkdir(testDirPath, 0755)
+		Expect(err).To(BeNil())
+		defer os.RemoveAll(testDirPath)
+
+		// Copy the root directory of the container to an existing directory
+		session = podmanTest.Podman([]string{"cp", ctrName + ":/", testDirPath})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		// The file should be in the directory,
+		// not one layer too much of the directory called merged
+		checkFile := filepath.Join(testDirPath, DockerfileName)
+		_, err = os.Stat(checkFile)
+		Expect(err).To(BeNil())
+
+		session = podmanTest.Podman([]string{"container", "rm", ctrName})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.PodmanNoCache([]string{"rmi", "-f", imgName})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
 })
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index b9a1ff83d..822e470f2 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -429,4 +429,19 @@ var _ = Describe("Podman create", func() {
 		Expect(len(data)).To(Equal(1))
 		Expect(data[0].HostConfig.NanoCpus).To(Equal(int64(nanoCPUs)))
 	})
+
+	It("podman create --replace", func() {
+		// Make sure we error out with --name.
+		session := podmanTest.Podman([]string{"create", "--replace", ALPINE, "/bin/sh"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+
+		// Create and replace 5 times in a row the "same" container.
+		ctrName := "testCtr"
+		for i := 0; i < 5; i++ {
+			session = podmanTest.Podman([]string{"create", "--replace", "--name", ctrName, ALPINE, "/bin/sh"})
+			session.WaitWithDefaultTimeout()
+			Expect(session.ExitCode()).To(Equal(0))
+		}
+	})
 })
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index f36163ccc..f9446e0c6 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -288,4 +288,16 @@ var _ = Describe("Podman logs", func() {
 		logc.WaitWithDefaultTimeout()
 		Expect(logc).To(Exit(0))
 	})
+
+	It("follow output stopped container", func() {
+		containerName := "logs-f"
+
+		logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE})
+		logc.WaitWithDefaultTimeout()
+		Expect(logc).To(Exit(0))
+
+		results := podmanTest.Podman([]string{"logs", "-f", containerName})
+		results.WaitWithDefaultTimeout()
+		Expect(results).To(Exit(0))
+	})
 })
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index a7d5783cb..8d07f6290 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -305,4 +305,19 @@ var _ = Describe("Podman pod create", func() {
 		data := check.InspectPodToJSON()
 		Expect(data.ID).To(Equal(string(id)))
 	})
+
+	It("podman pod create --replace", func() {
+		// Make sure we error out with --name.
+		session := podmanTest.Podman([]string{"pod", "create", "--replace", ALPINE, "/bin/sh"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+
+		// Create and replace 5 times in a row the "same" pod.
+		podName := "testCtr"
+		for i := 0; i < 5; i++ {
+			session = podmanTest.Podman([]string{"pod", "create", "--replace", "--name", podName})
+			session.WaitWithDefaultTimeout()
+			Expect(session.ExitCode()).To(Equal(0))
+		}
+	})
 })
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 59215c7e5..76944b3db 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -931,4 +931,19 @@ USER mail`
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 	})
+
+	It("podman run --replace", func() {
+		// Make sure we error out with --name.
+		session := podmanTest.Podman([]string{"create", "--replace", ALPINE, "/bin/sh"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+
+		// Run and replace 5 times in a row the "same" container.
+		ctrName := "testCtr"
+		for i := 0; i < 5; i++ {
+			session := podmanTest.Podman([]string{"run", "--detach", "--replace", "--name", ctrName, ALPINE, "/bin/sh"})
+			session.WaitWithDefaultTimeout()
+			Expect(session.ExitCode()).To(Equal(0))
+		}
+	})
 })