From 2ee4caf56b8e000cabbb73ad81ff05738d6d0a35 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 7 Apr 2022 07:02:21 +0200 Subject: Refs #33173 -- Fixed test_runner/test_utils tests on Python 3.11+. Python 3.11 uses fully qualified test name in unittest output. See https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9 --- tests/test_utils/tests.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/test_utils') diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index e704ed5dc1..6a4467fdcb 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -48,6 +48,7 @@ from django.test.utils import ( from django.urls import NoReverseMatch, path, reverse, reverse_lazy from django.utils.deprecation import RemovedInDjango50Warning from django.utils.log import DEFAULT_LOGGING +from django.utils.version import PY311 from .models import Car, Person, PossessedCar from .views import empty_response @@ -100,9 +101,11 @@ class SkippingTestCase(SimpleTestCase): SkipTestCase("test_foo").test_foo, ValueError, "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests." - "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase) " + "SkippingTestCase.test_skip_unless_db_feature..SkipTestCase%s) " "as SkippingTestCase.test_skip_unless_db_feature..SkipTestCase " - "doesn't allow queries against the 'default' database.", + "doesn't allow queries against the 'default' database." + # Python 3.11 uses fully qualified test name in the output. + % (".test_foo" if PY311 else ""), ) def test_skip_if_db_feature(self): @@ -145,9 +148,11 @@ class SkippingTestCase(SimpleTestCase): SkipTestCase("test_foo").test_foo, ValueError, "skipIfDBFeature cannot be used on test_foo (test_utils.tests." - "SkippingTestCase.test_skip_if_db_feature..SkipTestCase) " + "SkippingTestCase.test_skip_if_db_feature..SkipTestCase%s) " "as SkippingTestCase.test_skip_if_db_feature..SkipTestCase " - "doesn't allow queries against the 'default' database.", + "doesn't allow queries against the 'default' database." + # Python 3.11 uses fully qualified test name in the output. + % (".test_foo" if PY311 else ""), ) -- cgit v1.3