From d7f6f4e8819cca1f5d14194ec685596c198855cf Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 8 Dec 2021 09:40:29 +0100 Subject: remove runlabel test for global opts GLOBAL_OPTS haven't been supported for at least two major versions of Podman. The runlabel code is extremely fragile and I think it should be rewritten before adding new features. Fixes: #12436 Signed-off-by: Valentin Rothberg --- test/e2e/runlabel_test.go | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'test/e2e') 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") -- cgit v1.2.3-54-g00ecf