Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

System tests: reenable some skipped tests #7803

Merged
merged 1 commit into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions test/system/030-run.bats
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ echo $rand | 0 | $rand
}

@test "podman run --pull" {
skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"

run_podman run --pull=missing $IMAGE true
is "$output" "" "--pull=missing [present]: no output"

Expand Down Expand Up @@ -267,8 +265,6 @@ echo $rand | 0 | $rand
# symptom only manifests on a fedora container image -- we have no
# reproducer on alpine. Checking directory ownership is good enough.
@test "podman run : user namespace preserved root ownership" {
skip_if_remote "FIXME: pending #7195"

for priv in "" "--privileged"; do
for user in "--user=0" "--user=100"; do
for keepid in "" "--userns=keep-id"; do
Expand All @@ -286,8 +282,6 @@ echo $rand | 0 | $rand

# #6829 : add username to /etc/passwd inside container if --userns=keep-id
@test "podman run : add username to /etc/passwd if --userns=keep-id" {
skip_if_remote "FIXME: pending #7195"

# Default: always run as root
run_podman run --rm $IMAGE id -un
is "$output" "root" "id -un on regular container"
Expand All @@ -310,8 +304,6 @@ echo $rand | 0 | $rand

# #6991 : /etc/passwd is modifiable
@test "podman run : --userns=keep-id: passwd file is modifiable" {
skip_if_remote "FIXME: pending #7195"

run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done'
cid="$output"

Expand Down
8 changes: 8 additions & 0 deletions test/system/070-build.bats
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ Labels.$label_name | $label_value
is "${lines[-1]}" "... ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
"image tree: last layer line"

# FIXME: 'image tree --whatrequires' does not work via remote
if ! is_remote; then
run_podman image tree --whatrequires $IMAGE
is "${lines[-1]}" \
".*ID: .* Top Layer of: \\[localhost/build_test:latest\\]" \
"'image tree --whatrequires' shows our built image"
fi

# Clean up
run_podman rmi -f build_test
}
Expand Down
4 changes: 3 additions & 1 deletion test/system/080-pause.bats
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
load helpers

@test "podman pause/unpause" {
skip_if_rootless "pause does not work rootless"
if is_rootless && ! is_cgroupsv2; then
skip "'podman pause' (rootless) only works with cgroups v2"
fi

cname=$(random_string 10)
run_podman run -d --name $cname $IMAGE \
Expand Down
1 change: 0 additions & 1 deletion test/system/160-volumes.bats
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ EOF
# Confirm that container sees the correct id
@test "podman volume with --userns=keep-id" {
is_rootless || skip "only meaningful when run rootless"
skip_if_remote "FIXME: pending #7195"

myvoldir=${PODMAN_TMPDIR}/volume_$(random_string)
mkdir $myvoldir
Expand Down
10 changes: 10 additions & 0 deletions test/system/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,16 @@ function is_remote() {
[[ "$PODMAN" =~ -remote ]]
}

function is_cgroupsv1() {
# WARNING: This will break if there's ever a cgroups v3
! is_cgroupsv2
}

function is_cgroupsv2() {
cgroup_type=$(stat -f -c %T /sys/fs/cgroup)
test "$cgroup_type" = "cgroupfs"
}

###########################
# _add_label_if_missing # make sure skip messages include rootless/remote
###########################
Expand Down