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

Tests: remove/update obsolete skips #19234

Merged
merged 1 commit into from
Jul 14, 2023
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
2 changes: 1 addition & 1 deletion test/e2e/play_kube_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4884,7 +4884,7 @@ ENV OPENJ9_JAVA_OPTIONS=%q
})

It("podman play kube with disabled cgroup", func() {
SkipIfRunc(podmanTest, "Test not supported with runc, see issue #17436")
SkipIfRunc(podmanTest, "Test not supported with runc (issue 17436, wontfix)")
conffile := filepath.Join(podmanTest.TempDir, "container.conf")
// Disabled ipcns and cgroupfs in the config file
// Since shmsize (Inherit from infra container) cannot be set if ipcns is "host", we should remove the default value.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/pod_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ ENTRYPOINT ["sleep","99999"]

It("podman pod create --share-parent test", func() {
SkipIfRootlessCgroupsV1("rootless cannot use cgroups with cgroupsv1")
SkipIfCgroupV1("FIXME: #15013: CgroupMode shows 'host' instead of CID under Cgroups V1.")
SkipIfCgroupV1("CgroupMode shows 'host' on CGv1, not CID (issue 15013, wontfix")
podCreate := podmanTest.Podman([]string{"pod", "create", "--share-parent=false"})
podCreate.WaitWithDefaultTimeout()
Expect(podCreate).Should(Exit(0))
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/run_memory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ var _ = Describe("Podman run memory", func() {
})

It("podman run memory-reservation test", func() {
if podmanTest.Host.Distribution == "ubuntu" {
Skip("Unable to perform test on Ubuntu distributions due to memory management")
}

var session *PodmanSessionIntegration

if CGROUPSV2 {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run_userns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var _ = Describe("Podman UserNS support", func() {
})

It("podman uidmapping and gidmapping with an idmapped volume", func() {
SkipIfRunc(podmanTest, "Test not supported yet with runc, see issue #17433")
SkipIfRunc(podmanTest, "Test not supported yet with runc (issue 17433, wontfix)")
SkipOnOSVersion("fedora", "36")
session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/foo"})
session.WaitWithDefaultTimeout()
Expand Down
4 changes: 2 additions & 2 deletions test/system/030-run.bats
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ echo $rand | 0 | $rand
}

@test "podman run - uidmapping has no /sys/kernel mounts" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
skip_if_rootless "cannot umount as rootless"
skip_if_remote "TODO Fix this for remote case"

Expand Down Expand Up @@ -877,7 +877,7 @@ EOF

# rhbz#1902979 : podman run fails to update /etc/hosts when --uidmap is provided
@test "podman run update /etc/hosts" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
HOST=$(random_string 25)
run_podman run --uidmap 0:10001:10002 --rm --hostname ${HOST} $IMAGE grep ${HOST} /etc/hosts
is "${lines[0]}" ".*${HOST}.*"
Expand Down
5 changes: 0 additions & 5 deletions test/system/070-build.bats
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ EOF
}

@test "podman buildx - basic test" {
run_podman info --format "{{.Store.GraphDriverName}}"
if [[ "$output" == "vfs" ]]; then
skip "Test not supported with VFS podman storage driver (#17520)"
fi

rand_filename=$(random_string 20)
rand_content=$(random_string 50)

Expand Down
3 changes: 0 additions & 3 deletions test/system/120-load.bats
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ verify_iid_and_name() {

@test "podman image scp transfer" {
skip_if_remote "only applicable under local podman"
if is_ubuntu; then
skip "I don't have time to deal with this"
fi

# The testing is the same whether we're root or rootless; all that
# differs is the destination (not-me) username.
Expand Down
4 changes: 2 additions & 2 deletions test/system/170-run-userns.bats
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ function _require_crun() {
}

@test "podman --group-add without keep-groups while in a userns" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
skip_if_rootless "chroot is not allowed in rootless mode"
skip_if_remote "--group-add keep-groups not supported in remote mode"
run chroot --groups 1234,5678 / ${PODMAN} run --rm --uidmap 0:200000:5000 --group-add 457 $IMAGE id
is "$output" ".*457" "Check group leaked into container"
}

@test "rootful pod with custom ID mapping" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
skip_if_rootless "does not work rootless - rootful feature"
random_pod_name=$(random_string 30)
run_podman pod create --uidmap 0:200000:5000 --name=$random_pod_name
Expand Down
5 changes: 0 additions & 5 deletions test/system/250-systemd.bats
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@ function service_cleanup() {
# These tests can fail in dev. environment because of SELinux.
# quick fix: chcon -t container_runtime_exec_t ./bin/podman
@test "podman generate - systemd - basic" {
# Flakes with "ActiveState=failed (expected =inactive)"
if is_ubuntu; then
skip "FIXME: 2022-09-01: requires conmon-2.1.4, ubuntu has 2.1.3"
fi

# Warn when a custom restart policy is used without --new (see #15284)
run_podman create --restart=always $IMAGE
cid="$output"
Expand Down
2 changes: 1 addition & 1 deletion test/system/252-quadlet.bats
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function start_time() {

function setup() {
skip_if_remote "quadlet tests are meaningless over remote"
skip_if_rootless_cgroupsv1 "Can't use --cgroups=split w/ CGv1 (#17456)"
skip_if_rootless_cgroupsv1 "Can't use --cgroups=split w/ CGv1 (issue 17456, wontfix)"
skip_if_journald_unavailable "quadlet isn't really usable without journal"

test -x "$QUADLET" || die "Cannot run quadlet tests without executable \$QUADLET ($QUADLET)"
Expand Down
2 changes: 1 addition & 1 deletion test/system/400-unprivileged-access.bats
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
load helpers

@test "podman container storage is not accessible by unprivileged users" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
skip_if_rootless "test meaningless without suid"
skip_if_remote

Expand Down
2 changes: 1 addition & 1 deletion test/system/410-selinux.bats
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function check_label() {
skip_if_rootless_cgroupsv1

if [[ $(podman_runtime) == "runc" ]]; then
skip "some sort of runc bug, not worth fixing (#11784)"
skip "some sort of runc bug, not worth fixing (issue 11784, wontfix)"
fi

run_podman run -d --name myctr $IMAGE top
Expand Down
4 changes: 2 additions & 2 deletions test/system/500-networking.bats
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ load helpers.network

# Issue #5466 - port-forwarding doesn't work with this option and -d
@test "podman networking: port with --userns=keep-id for rootless or --uidmap=* for rootful" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
for cidr in "" "$(random_rfc1918_subnet).0/24"; do
myport=$(random_free_port 52000-52999)
if [[ -z $cidr ]]; then
Expand Down Expand Up @@ -771,7 +771,7 @@ EOF
}

@test "podman run /etc/* permissions" {
skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
skip_if_cgroupsv1 "run --uidmap fails on cgroups v1 (issue 15025, wontfix)"
userns="--userns=keep-id"
if ! is_rootless; then
userns="--uidmap=0:1111111:65536 --gidmap=0:1111111:65536"
Expand Down
8 changes: 0 additions & 8 deletions test/system/520-checkpoint.bats
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ load helpers.network

CHECKED_ROOTLESS=
function setup() {
# FIXME: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
# TL;DR they keep fixing it then breaking it again. There's a test we
# could run to see if it's fixed, but it's way too complicated. Since
# integration tests also skip checkpoint tests on Ubuntu, do the same here.
if is_ubuntu; then
skip "FIXME: checkpointing broken in Ubuntu 2004, 2104, 2110, 2204, ..."
fi

# None of these tests work rootless....
if is_rootless; then
# ...however, is that a genuine cast-in-stone limitation, or one
Expand Down
4 changes: 0 additions & 4 deletions test/system/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,6 @@ function wait_for_file() {
# BEGIN miscellaneous tools

# Shortcuts for common needs:
function is_ubuntu() {
grep -qiw ubuntu /etc/os-release
}

function is_rootless() {
[ "$(id -u)" -ne 0 ]
}
Expand Down