mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 14:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/python-utils-r1: Sync with Gentoo

Browse Source 
It's from Gentoo commit a24673569d3d66f4c554e6c7dfb12e01912172e5.
This commit is contained in:
Flatcar Buildbot 2025-04-28 07:16:16 +00:00
parent 7c6abd4b51
commit 3533fa2ab6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass vendored
View File

@ -1279,7 +1279,7 @@ _python_check_occluded_packages() {
) )
if [[ -n ${diff} ]]; then if [[ -n ${diff} ]]; then
eqawarn "The directory ${fn} occludes package installed for ${EPYTHON}." eqawarn "QA Notice: The directory ${fn} occludes package installed for ${EPYTHON}."
eqawarn "The installed package includes additional files:" eqawarn "The installed package includes additional files:"
eqawarn eqawarn
while IFS= read -r l; do while IFS= read -r l; do
@ -1481,7 +1481,7 @@ epytest() {
# @FUNCTION: eunittest # @FUNCTION: eunittest
# @USAGE: [<args>...] # @USAGE: [<args>...]
# @DESCRIPTION: # @DESCRIPTION:
# Run unit tests using dev-python/unittest-or-fail, passing the standard # Run unit tests using unittest, passing the standard
# set of options, followed by user-specified options. # set of options, followed by user-specified options.
# #
# This command dies on failure and respects nonfatal. # This command dies on failure and respects nonfatal.
@ -1492,11 +1492,7 @@ eunittest() {
_python_check_occluded_packages _python_check_occluded_packages
# unittest fails with "no tests" correctly since Python 3.12 # unittest fails with "no tests" correctly since Python 3.12
local runner=unittest set -- "${EPYTHON}" -m unittest discover -v "${@}"
if _python_impl_matches "${EPYTHON}" 3.{9..11}; then
runner=unittest_or_fail
fi
set -- "${EPYTHON}" -m "${runner}" discover -v "${@}"
echo "${@}" >&2 echo "${@}" >&2
"${@}" || die -n "Tests failed with ${EPYTHON}" "${@}" || die -n "Tests failed with ${EPYTHON}"