summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-23 10:00:21 +0200
committerGitHub <noreply@github.com>2020-06-23 10:00:21 +0200
commit9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0 (patch)
tree374e31027ef0f48891cbac1abfc19637cd57bb99 /test
parent22a7d60f18a60bda02b40b5f2489014ba5f1c651 (diff)
parentf61a7f25a8a6ec27fec069989f4b19b2ea19fc75 (diff)
downloadpodman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.tar.gz
podman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.tar.bz2
podman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.zip
Merge pull request #6625 from QiWang19/fd
Add --preservefds to podman run
Diffstat (limited to 'test')
-rw-r--r--test/e2e/run_test.go12
-rw-r--r--test/system/030-run.bats12
2 files changed, 24 insertions, 0 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 7e75e2605..90179964d 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -1027,4 +1027,16 @@ USER mail`
Expect(session.ExitCode()).To(Equal(0))
}
})
+
+ It("podman run --preserve-fds", func() {
+ devNull, err := os.Open("/dev/null")
+ Expect(err).To(BeNil())
+ defer devNull.Close()
+ files := []*os.File{
+ devNull,
+ }
+ session := podmanTest.PodmanExtraFiles([]string{"run", "--preserve-fds", "1", ALPINE, "ls"}, files)
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ })
})
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index aa9ace332..eeecea2e5 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -61,6 +61,18 @@ echo $rand | 0 | $rand
is "$tests_run" "$(grep . <<<$tests | wc -l)" "Ran the full set of tests"
}
+# 'run --preserve-fds' passes a number of additional file descriptors into the container
+@test "podman run --preserve-fds" {
+ skip "enable this once #6653 is fixed"
+ skip_if_remote
+
+ content=$(random_string 20)
+ echo "$content" > $PODMAN_TMPDIR/tempfile
+
+ run_podman run --rm -i --preserve-fds=2 $IMAGE sh -c "cat <&4" 4<$PODMAN_TMPDIR/tempfile
+ is "$output" "$content" "container read input from fd 4"
+}
+
@test "podman run - uidmapping has no /sys/kernel mounts" {
skip_if_rootless "cannot umount as rootless"
skip_if_remote "TODO Fix this for remote case"