diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_entrypoint_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/runlabel_test.go | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index e91e75adf..4fb6054e2 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -103,7 +103,6 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] }) It("podman run user entrypoint overrides image entrypoint and image cmd", func() { - SkipIfRemote("#12521: podman-remote not handling passing empty --entrypoint") dockerfile := `FROM quay.io/libpod/alpine:latest CMD ["-i"] ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index b7b27dc14..36c1f856c 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -18,10 +18,6 @@ var LsDockerfile = fmt.Sprintf(` FROM %s LABEL RUN ls -la`, ALPINE) -var GlobalDockerfile = fmt.Sprintf(` -FROM %s -LABEL RUN echo \$GLOBAL_OPTS`, ALPINE) - var PodmanRunlabelNameDockerfile = fmt.Sprintf(` FROM %s LABEL RUN podman run --name NAME IMAGE`, ALPINE) @@ -104,22 +100,6 @@ var _ = Describe("podman container runlabel", func() { Expect(result.OutputToString()).To(Not(ContainSubstring("panic"))) }) - It("podman container runlabel global options", func() { - fmt.Printf("FIXME: for lint. Remove when you fix this test: %s", GlobalDockerfile) - Skip("FIXME: $GLOBAL_OPTS does not work at all, #12436") - image := "podman-global-test:ls" - podmanTest.BuildImage(GlobalDockerfile, image, "false") - result := podmanTest.Podman([]string{"--syslog", "--log-level", "debug", "container", "runlabel", "RUN", image}) - result.WaitWithDefaultTimeout() - Expect(result).Should(Exit(0)) - - Expect(result.OutputToString()).To(ContainSubstring("--syslog true")) - Expect(result.OutputToString()).To(ContainSubstring("--log-level debug")) - result = podmanTest.Podman([]string{"rmi", image}) - result.WaitWithDefaultTimeout() - Expect(result).Should(Exit(0)) - }) - It("runlabel should fail with nonexistent authfile", func() { image := "podman-runlabel-test:podman" podmanTest.BuildImage(PodmanDockerfile, image, "false") |