diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 19:55:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 19:55:02 +0100 |
commit | b735aa8122cd01a3e7146a7c6f0662b37bbaf377 (patch) | |
tree | 12ec0a157ba7f7e2fd57bf93f577b45ba9737705 /test/system/075-exec.bats | |
parent | 055a7a909103cda8c18b8f24ecd9b919c49074f4 (diff) | |
parent | a17fb01d400f8f3504099fbd65e284124432f274 (diff) | |
download | podman-b735aa8122cd01a3e7146a7c6f0662b37bbaf377.tar.gz podman-b735aa8122cd01a3e7146a7c6f0662b37bbaf377.tar.bz2 podman-b735aa8122cd01a3e7146a7c6f0662b37bbaf377.zip |
Merge pull request #8535 from edsantiago/bats
BATS: add ping test, ps filters, multi-option
Diffstat (limited to 'test/system/075-exec.bats')
-rw-r--r-- | test/system/075-exec.bats | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats index edd7dedc4..c028e16c9 100644 --- a/test/system/075-exec.bats +++ b/test/system/075-exec.bats @@ -91,7 +91,8 @@ load helpers # #6829 : add username to /etc/passwd inside container if --userns=keep-id @test "podman exec - with keep-id" { - run_podman run -d --userns=keep-id $IMAGE sh -c \ + # Multiple --userns options confirm command-line override (last one wins) + run_podman run -d --userns=private --userns=keep-id $IMAGE sh -c \ "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" cid="$output" wait_for_ready $cid |