Python 3.10 compatibility backport

This commit is contained in:
Miro Hrončok 2020-11-20 09:34:45 +01:00
parent 79cb83711c
commit 76da6fc8a7
2 changed files with 29 additions and 0 deletions

26
d9ac2efbcd.patch Normal file
View File

@ -0,0 +1,26 @@
From d9ac2efbcdee123f73edf1829c8bd6a91be3b6d2 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 25 Oct 2020 01:08:12 +0200
Subject: [PATCH] testing: python 3.10 fix
---
testing/test_runner.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/testing/test_runner.py b/testing/test_runner.py
index 95b8f5fccb..a1f1db48d0 100644
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -336,10 +336,9 @@ def test_method(self):
assert reps[2].failed
assert reps[2].when == "teardown"
assert reps[2].longrepr.reprcrash.message in (
- # python3 error
"TypeError: teardown_method() missing 2 required positional arguments: 'y' and 'z'",
- # python2 error
- "TypeError: teardown_method() takes exactly 4 arguments (2 given)",
+ # Python >= 3.10
+ "TypeError: TestClass.teardown_method() missing 2 required positional arguments: 'y' and 'z'",
)
def test_failure_in_setup_function_ignores_custom_repr(self, testdir) -> None:

View File

@ -6,6 +6,9 @@ License: MIT
URL: https://pytest.org
Source0: %{pypi_source}
# Python 3.10 compatibility
Patch1: https://github.com/pytest-dev/pytest/commit/d9ac2efbcd.patch
# When building pytest for the first time with new Python version
# we might not yet have all the BRs, those conditionals allow us to do that.