diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-30 17:22:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 17:22:54 +0000 |
| commit | f86e01ab10821d99cebb82d10c3bd5dad77af8c6 (patch) | |
| tree | 8076aa51152c2c6f5e17719e896acec1182f2676 /test/system | |
| parent | e2050d7c351d14cab2ccaa09f8a6409688496727 (diff) | |
| parent | 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5 (diff) | |
| download | podman-f86e01ab10821d99cebb82d10c3bd5dad77af8c6.tar.gz podman-f86e01ab10821d99cebb82d10c3bd5dad77af8c6.tar.bz2 podman-f86e01ab10821d99cebb82d10c3bd5dad77af8c6.zip | |
Merge pull request #7820 from giuseppe/fix-capabilities-not-root
capabilities: always set ambient and inheritable
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/030-run.bats | 4 | ||||
| -rw-r--r-- | test/system/075-exec.bats | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index eb740f04b..766948ecc 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -319,7 +319,7 @@ echo $rand | 0 | $rand # #6991 : /etc/passwd is modifiable @test "podman run : --userns=keep-id: passwd file is modifiable" { - run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done' + run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done' cid="$output" # Assign a UID that is (a) not in our image /etc/passwd and (b) not @@ -340,7 +340,7 @@ echo $rand | 0 | $rand is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \ "newuser3 added to /etc/passwd in container" - run_podman exec $cid touch /stop + run_podman exec $cid touch /tmp/stop run_podman wait $cid } diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats index e9db8c27e..edd7dedc4 100644 --- a/test/system/075-exec.bats +++ b/test/system/075-exec.bats @@ -92,14 +92,14 @@ 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 \ - "echo READY;while [ ! -f /stop ]; do sleep 1; done" + "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" cid="$output" wait_for_ready $cid run_podman exec $cid id -un is "$output" "$(id -un)" "container is running as current user" - run_podman exec --user=$(id -un) $cid touch /stop + run_podman exec --user=$(id -un) $cid touch /tmp/stop run_podman wait $cid run_podman rm $cid } |