diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-08 14:42:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 14:42:19 +0000 |
| commit | d6079debd86861c40f98cf66d6da3208bc5b397a (patch) | |
| tree | 7cd73b44bcabdc444228e08b55f1b1f5f1838637 /test/e2e/runlabel_test.go | |
| parent | 2d88c5f54344c156f121cc435983b109cfe3104c (diff) | |
| parent | d7f6f4e8819cca1f5d14194ec685596c198855cf (diff) | |
| download | podman-d6079debd86861c40f98cf66d6da3208bc5b397a.tar.gz podman-d6079debd86861c40f98cf66d6da3208bc5b397a.tar.bz2 podman-d6079debd86861c40f98cf66d6da3208bc5b397a.zip | |
Merge pull request #12529 from vrothberg/fix-12436
remove runlabel test for global opts
Diffstat (limited to 'test/e2e/runlabel_test.go')
| -rw-r--r-- | test/e2e/runlabel_test.go | 20 |
1 files changed, 0 insertions, 20 deletions
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") |