diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-09 16:40:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 16:40:32 +0200 |
| commit | 3a4bd395164c97bf4b8b1fcb97f2475ca188866e (patch) | |
| tree | 0ea6731642214231446e5e2c53ed33c80347b0d7 /test/e2e/exec_test.go | |
| parent | 1662310e516cb3c21842f59b8f607bb0af408ec5 (diff) | |
| parent | 4503650f418aa0da0c6e63949c60a9af035f8681 (diff) | |
| download | podman-3a4bd395164c97bf4b8b1fcb97f2475ca188866e.tar.gz podman-3a4bd395164c97bf4b8b1fcb97f2475ca188866e.tar.bz2 podman-3a4bd395164c97bf4b8b1fcb97f2475ca188866e.zip | |
Merge pull request #5771 from giuseppe/fix-exec-preserve-fd
test: fix exec preserve-fds test
Diffstat (limited to 'test/e2e/exec_test.go')
| -rw-r--r-- | test/e2e/exec_test.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 5d0d6e689..8b95794d2 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -244,15 +244,17 @@ var _ = Describe("Podman exec", func() { }) It("podman exec preserve fds sanity check", func() { - // TODO: add this test once crun adds the --preserve-fds flag for exec - if strings.Contains(podmanTest.OCIRuntime, "crun") { - Skip("Test only works on crun") - } setup := podmanTest.RunTopContainer("test1") setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) - session := podmanTest.Podman([]string{"exec", "--preserve-fds", "1", "test1", "ls"}) + devNull, err := os.Open("/dev/null") + Expect(err).To(BeNil()) + defer devNull.Close() + files := []*os.File{ + devNull, + } + session := podmanTest.PodmanExtraFiles([]string{"exec", "--preserve-fds", "1", "test1", "ls"}, files) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) |