diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-05 09:37:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 09:37:59 +0200 |
| commit | 47971909ae7a54c3a0b0fe4ebe33197c9e291657 (patch) | |
| tree | b67689e7e2cc0e8c3ace91d31c3bf276b0784978 /test | |
| parent | 6260677012080aa6aa52ead7ec54261d8d6017a0 (diff) | |
| parent | 34e82f81bdbdd26b82501bc2d27d18aaab5747dd (diff) | |
| download | podman-47971909ae7a54c3a0b0fe4ebe33197c9e291657.tar.gz podman-47971909ae7a54c3a0b0fe4ebe33197c9e291657.tar.bz2 podman-47971909ae7a54c3a0b0fe4ebe33197c9e291657.zip | |
Merge pull request #7125 from QiWang19/fd-validate
validate fds --preserve-fds
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 7 | ||||
| -rw-r--r-- | test/system/030-run.bats | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index f2a6d14eb..574c5c3f2 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1063,6 +1063,13 @@ USER mail` Expect(session.ExitCode()).To(Equal(0)) }) + It("podman run --preserve-fds invalid fd", func() { + session := podmanTest.Podman([]string{"run", "--preserve-fds", "2", ALPINE}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Not(Equal(0))) + Expect(session.ErrorToString()).To(ContainSubstring("file descriptor 3 is not available")) + }) + It("podman run --privileged and --group-add", func() { groupName := "kvm" session := podmanTest.Podman([]string{"run", "-t", "-i", "--group-add", groupName, "--privileged", fedoraMinimal, "groups"}) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 43b41a0bd..41863ba04 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -63,7 +63,6 @@ echo $rand | 0 | $rand # '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) |