rpms/osbuild
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable failing tests

Browse Source 
Disable failing tests during rpmbuild in the SPEC file.
See https://github.com/osbuild/osbuild/pull/2338

Also disable one failing tests in the TMT CI run.

Resolves: RHEL-111405

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
imagebuilder-bot 2026-02-06 18:58:44 +00:00 committed by Tomáš Hozza
parent eff9a2f74b
commit 3899eb5403
No known key found for this signature in database
GPG Key ID: C5887AD51D9F3C2D
2 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
osbuild.spec
View File

@ -311,18 +311,80 @@ install -p -m 0644 tools/solver-dnf.json %{buildroot}%{pkgdir}/solver.json
# Since we can't be granular enough, skip tests based on the OS only.
# This means some tests won't be run even though they could,
# but that's an acceptable tradeoff.
ignore_files=()
skip_tests=()
# x86_64-specific tests:
# test/mod/test_util_sbom_spdx.py, test/mod/test_util_sbom_dnf.py, test/mod/test_testutil_dnf4.py
# test/mod/test_util_sbom_spdx.py
# test/mod/test_util_sbom_dnf.py
# test/mod/test_testutil_dnf4.py
# test/mod/test_solver_implementations.py
# test_ioctl_toggle_immutable and test_rmtree_immutable fail on s390x
# test_cache_full_behavior fails on ppc64le
# tools/test/test_depsolve.py fails on C9S and EPEL9
ignore="--ignore test/mod/test_util_sbom_spdx.py --ignore test/mod/test_util_sbom_dnf.py --ignore test/mod/test_testutil_dnf4.py --ignore test/mod/test_solver_implementations.py"
skip="not test_ioctl_toggle_immutable and not test_rmtree_immutable and not test_cache_full_behavior"
%if 0%{?rhel}
ignore="$ignore --ignore tools/test/test_depsolve.py"
%ifnarch x86_64
ignore_files+=(
test/mod/test_util_sbom_spdx.py
test/mod/test_util_sbom_dnf.py
test/mod/test_testutil_dnf4.py
test/mod/test_solver_implementations.py
)
%endif
%pytest %{?fedora:-n auto} -v %{?rhel:-m "not tomlwrite"} ${ignore:-} -k "${skip:-}"
# fails on s390x:
# test_ioctl_toggle_immutable
# test_rmtree_immutable
%ifarch s390x
skip_tests+=(
test_ioctl_toggle_immutable
test_rmtree_immutable
)
%endif
# fails on ppc64le:
# TestAPI.test_exception - https://github.com/osbuild/osbuild/issues/2337
# TestUtilJsonComm.test_send_and_recv_tons_of_data_is_fine - https://github.com/osbuild/osbuild/issues/2336
# TestUtilJsonComm.test_sendmsg_errors_with_size_on_EMSGSIZE - https://github.com/osbuild/osbuild/issues/2342
%ifarch ppc64le
skip_tests+=(
"(TestAPI and test_exception)"
"(TestUtilJsonComm and test_send_and_recv_tons_of_data_is_fine)"
"(TestUtilJsonComm and test_sendmsg_errors_with_size_on_EMSGSIZE)"
)
%endif
# fails on ppc64le and aarch64:
# test_cache_full_behavior
%ifarch ppc64le || aarch64
skip_tests+=(
test_cache_full_behavior
)
%endif
# fails on C9S and EPEL9:
# tools/test/test_depsolve.py
# test_dnf4_pkg_to_package - https://github.com/osbuild/osbuild/issues/2339
%if 0%{?rhel} && 0%{?rhel} < 10
ignore_files+=(
tools/test/test_depsolve.py
)
skip_tests+=(
test_dnf4_pkg_to_package
)
%endif
ignore_args=()
for file in "${ignore_files[@]}"; do
ignore_args+=(--ignore "$file")
done
skip_test_expr=""
for test in "${skip_tests[@]}"; do
if [ "$skip_test_expr" != "" ]; then
skip_test_expr+=" and not $test"
else
skip_test_expr+="not $test"
fi
done
%pytest %{?fedora:-n auto} -v %{?rhel:-m "not tomlwrite"} ${ignore_args[@]} -k "${skip_test_expr}"
%endif
%files

2
tests/unit-tests/run-unit-tests.sh
View File

@ -48,6 +48,8 @@ fi
if ([ "${ID}" == "rhel" ] || [ "${ID}" == "centos" ]) && [ "${VERSION_ID%%.*}" == "9" ]; then
# tomli_w package is not available on el9 so writing TOML config will fail
TEST_SELECTION_EXPR="${TEST_SELECTION_EXPR} and not (test_write_read)"
# test_dnf4_pkg_to_package fails on el9 - https://github.com/osbuild/osbuild/pull/2338
TEST_SELECTION_EXPR="${TEST_SELECTION_EXPR} and not test_dnf4_pkg_to_package"
fi
# Move to the directory with sources