diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-11-28 10:57:21 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-11-28 12:00:57 +0100 |
| commit | e8b710c52af507e0e93b850f9a565d4bfffde12f (patch) | |
| tree | bfdec4406402276aca79af5ea20ac433882956d2 /dev-python/pip | |
| parent | media-gfx/freecad: dropped patch in live (diff) | |
| download | gentoo-e8b710c52af507e0e93b850f9a565d4bfffde12f.tar.gz gentoo-e8b710c52af507e0e93b850f9a565d4bfffde12f.tar.bz2 gentoo-e8b710c52af507e0e93b850f9a565d4bfffde12f.zip | |
dev-python/pip: Backport test changes to 21.3.1
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/pip')
| -rw-r--r-- | dev-python/pip/pip-21.3.1.ebuild | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/dev-python/pip/pip-21.3.1.ebuild b/dev-python/pip/pip-21.3.1.ebuild index 66022d354643..63a8c874c7eb 100644 --- a/dev-python/pip/pip-21.3.1.ebuild +++ b/dev-python/pip/pip-21.3.1.ebuild @@ -56,6 +56,7 @@ BDEPEND=" python_prepare_all() { local PATCHES=( "${FILESDIR}/${PN}-21.3-no-coverage.patch" + "${FILESDIR}/${P}-cryptography-tests.patch" ) if ! use vanilla; then PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) @@ -76,7 +77,7 @@ python_test() { return 0 fi - local deselect=( + local EPYTEST_DESELECT=( tests/functional/test_install.py::test_double_install_fail tests/functional/test_list.py::test_multiple_exclude_and_normalization 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' @@ -96,12 +97,21 @@ python_test() { tests/functional/test_pep660.py ) - [[ ${EPYTHON} == python3.10 ]] && deselect+=( + [[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=( tests/lib/test_lib.py::test_correct_pip_version # uses vendored packaging that uses deprecated distutils tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors ) + if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then + EPYTEST_DESELECT+=( + tests/functional/test_install.py::test_install_sends_client_cert + tests/functional/test_install_config.py::test_do_not_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + ) + fi + distutils_install_for_testing pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die distutils_install_for_testing @@ -110,7 +120,7 @@ python_test() { local -x GENTOO_PIP_TESTING=1 \ PATH="${TEST_DIR}/scripts:${PATH}" \ PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" - epytest ${deselect[@]/#/--deselect } -m "not network" + epytest -m "not network" } python_install_all() { |