diff options
author | Michał Górny <mgorny@gentoo.org> | 2022-12-31 08:35:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-30 23:35:35 -0800 |
commit | bfba43c4a8a3349f82651bfcfae64c40ae07a540 (patch) | |
tree | dfe81b90e214d2881bc19a00412864ab815604ea | |
parent | 6253d6220486e17c6132f613cc6218c87b084417 (diff) | |
download | tox-git-bfba43c4a8a3349f82651bfcfae64c40ae07a540.tar.gz |
Relax test_list_installed_deps() to allow other packages (#2796)
Relax the check in `test_list_installed_deps()` to allow `pip freeze`
to return other packages before `pip`. This is necessary
if the Python interpreter vendors some packages itself, so that they
are available even in fresh venv. This is the case e.g. for cffi
in PyPy.
-rw-r--r-- | docs/changelog/2796.misc.rst | 3 | ||||
-rw-r--r-- | tests/tox_env/python/test_python_api.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/changelog/2796.misc.rst b/docs/changelog/2796.misc.rst new file mode 100644 index 00000000..3ea0d60d --- /dev/null +++ b/docs/changelog/2796.misc.rst @@ -0,0 +1,3 @@ +Relax the assertion in ``test_list_installed_deps`` to allow packages +other than ``pip`` to be present in the fresh venv, to fix tests +on PyPy. diff --git a/tests/tox_env/python/test_python_api.py b/tests/tox_env/python/test_python_api.py index 90e2ab65..0520ff17 100644 --- a/tests/tox_env/python/test_python_api.py +++ b/tests/tox_env/python/test_python_api.py @@ -186,6 +186,6 @@ def test_list_installed_deps(in_ci: bool, tox_project: ToxProjectCreator, mocker mocker.patch("tox.tox_env.python.api.is_ci", return_value=in_ci) result = tox_project({"tox.ini": "[testenv]\nskip_install = true"}).run("r", "-e", "py") if in_ci: - assert "py: pip==" in result.out + assert "pip==" in result.out else: - assert "py: pip==" not in result.out + assert "pip==" not in result.out |