diff options
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/030-run.bats | 16 | ||||
| -rw-r--r-- | test/system/070-build.bats | 8 | ||||
| -rw-r--r-- | test/system/075-exec.bats | 2 | ||||
| -rw-r--r-- | test/system/320-system-df.bats | 62 |
4 files changed, 82 insertions, 6 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 04d1e4eac..b30c1103b 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -284,4 +284,20 @@ echo $rand | 0 | $rand is "$output" "root" "--user=0 overrides keep-id" } +# #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' + cid="$output" + + gecos="$(random_string 6) $(random_string 8)" + run_podman exec --user root $cid adduser -D -g "$gecos" -s /bin/sh newuser3 + is "$output" "" "output from adduser" + run_podman exec $cid tail -1 /etc/passwd + is "$output" "newuser3:x:1000:1000:$gecos:/home/newuser3:/bin/sh" \ + "newuser3 added to /etc/passwd in container" + + run_podman exec $cid touch /stop + run_podman wait $cid +} + # vim: filetype=sh diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 627b9caa6..a69d32a2f 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -143,7 +143,7 @@ RUN mkdir -p /a/b/c RUN ln -s /no/such/nonesuch /a/b/c/badsymlink RUN ln -s /bin/mydefaultcmd /a/b/c/goodsymlink RUN touch /a/b/c/myfile -RUN chown -h 1:2 /a/b/c/badsymlink /a/b/c/goodsymlink /a/b/c/myfile +RUN chown -h 1:2 /a/b/c/badsymlink /a/b/c/goodsymlink && chown -h 4:5 /a/b/c/myfile VOLUME /a/b/c # Test for environment passing and override @@ -216,18 +216,18 @@ Labels.$label_name | $label_value # be they dangling or valid, would barf with # Error: chown <mountpath>/_data/symlink: ENOENT run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/badsymlink - is "$output" "0:0:'/a/b/c/badsymlink' -> '/no/such/nonesuch'" \ + is "$output" "1:2:'/a/b/c/badsymlink' -> '/no/such/nonesuch'" \ "bad symlink to nonexistent file is chowned and preserved" run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/goodsymlink - is "$output" "0:0:'/a/b/c/goodsymlink' -> '/bin/mydefaultcmd'" \ + is "$output" "1:2:'/a/b/c/goodsymlink' -> '/bin/mydefaultcmd'" \ "good symlink to existing file is chowned and preserved" run_podman run --rm build_test stat -c'%u:%g' /bin/mydefaultcmd is "$output" "2:3" "target of symlink is not chowned" run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/myfile - is "$output" "0:0:/a/b/c/myfile" "file in volume is chowned to root" + is "$output" "4:5:/a/b/c/myfile" "file in volume is chowned" # Clean up run_podman rmi -f build_test diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats index 945bcfa2d..b2c49510a 100644 --- a/test/system/075-exec.bats +++ b/test/system/075-exec.bats @@ -81,8 +81,6 @@ load helpers # #6829 : add username to /etc/passwd inside container if --userns=keep-id # #6593 : doesn't actually work with podman exec @test "podman exec - with keep-id" { - skip "Please enable once #6593 is fixed" - run_podman run -d --userns=keep-id $IMAGE sh -c \ "echo READY;while [ ! -f /stop ]; do sleep 1; done" cid="$output" diff --git a/test/system/320-system-df.bats b/test/system/320-system-df.bats new file mode 100644 index 000000000..217357b37 --- /dev/null +++ b/test/system/320-system-df.bats @@ -0,0 +1,62 @@ +#!/usr/bin/env bats -*- bats -*- +# +# tests for podman system df +# + +load helpers + +function teardown() { + basic_teardown + + # In case the active-volumes test failed: clean up stray volumes + run_podman volume rm -a +} + +@test "podman system df - basic functionality" { + run_podman system df + is "$output" ".*Images *1 *0 " "Exactly one image" + is "$output" ".*Containers *0 *0 " "No containers" + is "$output" ".*Local Volumes *0 *0 " "No volumes" +} + +@test "podman system df - with active containers and volumes" { + run_podman run -v /myvol1 --name c1 $IMAGE true + run_podman run -d -v /myvol2 --name c2 $IMAGE \ + sh -c 'while ! test -e /stop; do sleep 0.1;done' + + run_podman system df --format '{{ .Type }}:{{ .Total }}:{{ .Active }}' + is "${lines[0]}" "Images:1:1" "system df : Images line" + is "${lines[1]}" "Containers:2:1" "system df : Containers line" + is "${lines[2]}" "Local Volumes:2:1" "system df : Volumes line" + + # Try -v. (Grrr. No way to specify individual formats) + # + # Yes, I know this would be more elegant as a separate @test, but + # container/volume setup/teardown costs ~3 seconds and that matters. + run_podman system df -v + is "${lines[2]}" \ + "${PODMAN_TEST_IMAGE_REGISTRY}/${PODMAN_TEST_IMAGE_USER}/${PODMAN_TEST_IMAGE_NAME} * ${PODMAN_TEST_IMAGE_TAG} [0-9a-f]* .* 2" \ + "system df -v: the 'Images' line" + + # Containers are listed in random order. Just check that each has 1 volume + is "${lines[5]}" \ + "[0-9a-f]\{12\} *[0-9a-f]\{12\} .* 1 .* c[12]" \ + "system df -v, 'Containers', first line" + is "${lines[6]}" \ + "[0-9a-f]\{12\} *[0-9a-f]\{12\} .* 1 .* c[12]" \ + "system df -v, 'Containers', second line" + + # Volumes, likewise: random order. + is "${lines[9]}" "[0-9a-f]\{64\} *[01] * 0B" \ + "system df -v, 'Volumes', first line" + is "${lines[10]}" "[0-9a-f]\{64\} *[01] * 0B" \ + "system df -v, 'Volumes', second line" + + # Clean up + run_podman exec c2 touch /stop + run_podman wait c2 + run_podman rm c1 c2 + run_podman volume rm -a +} + +# vim: filetype=sh |