dev-python/pytest-django: fix tests with pytest 7; enable py3.11

Closes: https://bugs.gentoo.org/834815
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-10-30 11:16:36 +00:00
parent e3afabe8d9
commit b4ca769092
2 changed files with 35 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
https://github.com/pytest-dev/pytest-django/commit/14b993d1cb291bfcf05f35f57db55c0419886534
https://bugs.gentoo.org/834815
From 14b993d1cb291bfcf05f35f57db55c0419886534 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Mon, 28 Feb 2022 13:12:37 +0300
Subject: [PATCH] tests: Sync expected stream for Pytest's version
https://docs.pytest.org/en/7.0.x/changelog.html#breaking-changes:
> [pytest#8246](https://github.com/pytest-dev/pytest/issues/8246): --version now writes version information to stdout rather than stderr.
Fixes: https://github.com/pytest-dev/pytest-django/issues/995
Signed-off-by: Stanislav Levin <slev@altlinux.org>
--- a/tests/test_manage_py_scan.py
+++ b/tests/test_manage_py_scan.py
@@ -118,7 +118,12 @@ def test_django_project_found_invalid_settings_version(django_testdir, monkeypat
result = django_testdir.runpytest_subprocess("django_project_root", "--version", "--version")
assert result.ret == 0
- result.stderr.fnmatch_lines(["*This is pytest version*"])
+ if hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 0):
+ version_out = result.stdout
+ else:
+ version_out = result.stderr
+
+ version_out.fnmatch_lines(["*This is pytest version*"])
result = django_testdir.runpytest_subprocess("django_project_root", "--help")
assert result.ret == 0

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
DESCRIPTION="A Django plugin for py.test"
@@ -30,6 +30,10 @@ BDEPEND="
)
"
PATCHES=(
"${FILESDIR}"/${P}-pytest-7.patch
)
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
distutils_enable_tests --install pytest