6 files changed, 63 insertions, 1 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index 9e41fd231..0cf5283ad 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -195,4 +195,21 @@ var _ = Describe("Podman build", func() {
 		Expect(session.ExitCode()).To(Equal(0))
 	})
 
+	It("podman build --http_proxy flag", func() {
+		SkipIfRemote()
+		os.Setenv("http_proxy", "1.2.3.4")
+		podmanTest.RestoreAllArtifacts()
+		dockerfile := `FROM docker.io/library/alpine:latest
+RUN printenv http_proxy`
+
+		dockerfilePath := filepath.Join(podmanTest.TempDir, "Dockerfile")
+		err := ioutil.WriteFile(dockerfilePath, []byte(dockerfile), 0755)
+		Expect(err).To(BeNil())
+		session := podmanTest.PodmanNoCache([]string{"build", "--file", dockerfilePath, podmanTest.TempDir})
+		session.Wait(120)
+		Expect(session.ExitCode()).To(Equal(0))
+		ok, _ := session.GrepString("1.2.3.4")
+		Expect(ok).To(BeTrue())
+		os.Unsetenv("http_proxy")
+	})
 })
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 497e8f71e..f43a4f865 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -362,7 +362,7 @@ var _ = Describe("Podman generate systemd", func() {
 		found, _ = session.GrepString("pod create --infra-conmon-pidfile %t/pod-foo.pid --pod-id-file %t/pod-foo.pod-id --name foo")
 		Expect(found).To(BeTrue())
 
-		found, _ = session.GrepString("ExecStartPre=/usr/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")
+		found, _ = session.GrepString("ExecStartPre=/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")
 		Expect(found).To(BeTrue())
 
 		found, _ = session.GrepString("pod stop --ignore --pod-id-file %t/pod-foo.pod-id -t 10")
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 0ee7260c2..b6391cebf 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -296,6 +296,15 @@ WORKDIR /test
 		sortValueTest("id", 125, "badvalue")
 	})
 
+	It("test for issue #6670", func() {
+		expected := podmanTest.Podman([]string{"images", "--sort", "created", "--format", "{{.ID}}", "-q"})
+		expected.WaitWithDefaultTimeout()
+
+		actual := podmanTest.Podman([]string{"images", "--sort", "created", "-q"})
+		actual.WaitWithDefaultTimeout()
+		Expect(expected.Out).Should(Equal(actual.Out))
+	})
+
 	It("podman images --all flag", func() {
 		podmanTest.RestoreAllArtifacts()
 		dockerfile := `FROM docker.io/library/alpine:latest
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index a4a59acb2..cf69cbd3e 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -311,4 +311,16 @@ var _ = Describe("Podman logs", func() {
 		logs.WaitWithDefaultTimeout()
 		Expect(logs).To(Not(Exit(0)))
 	})
+
+	It("follow output stopped container", func() {
+		containerName := "logs-f"
+
+		logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE, "true"})
+		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/run_test.go b/test/e2e/run_test.go
index 7e79a8668..90179964d 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -101,6 +101,18 @@ var _ = Describe("Podman run", func() {
 		Expect(match).Should(BeTrue())
 	})
 
+	It("podman create pod with name in /etc/hosts", func() {
+		name := "test_container"
+		hostname := "test_hostname"
+		session := podmanTest.Podman([]string{"run", "-ti", "--rm", "--name", name, "--hostname", hostname, ALPINE, "cat", "/etc/hosts"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		match, _ := session.GrepString(name)
+		Expect(match).Should(BeTrue())
+		match, _ = session.GrepString(hostname)
+		Expect(match).Should(BeTrue())
+	})
+
 	It("podman run a container based on remote image", func() {
 		session := podmanTest.Podman([]string{"run", "-dt", BB_GLIBC, "ls"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 9ba0241fe..4e37f7d7a 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -400,4 +400,16 @@ registries = ['{{.Host}}:{{.Port}}']`
 		search.WaitWithDefaultTimeout()
 		Expect(search.ExitCode()).To(Not(Equal(0)))
 	})
+
+	It("podman search with wildcards", func() {
+		search := podmanTest.Podman([]string{"search", "--limit", "30", "registry.redhat.io/*"})
+		search.WaitWithDefaultTimeout()
+		Expect(search.ExitCode()).To(Equal(0))
+		Expect(len(search.OutputToStringArray())).To(Equal(31))
+
+		search = podmanTest.Podman([]string{"search", "registry.redhat.io/*openshift*"})
+		search.WaitWithDefaultTimeout()
+		Expect(search.ExitCode()).To(Equal(0))
+		Expect(len(search.OutputToStringArray()) > 1).To(BeTrue())
+	})
 })