From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Sun, 30 Apr 2023 15:51:46 +0000 (+0100)
Subject: gh-104012: Ensure test_calendar.CalendarTestCase.test_deprecation_warning consistentl... 
X-Git-Tag: v3.12.0b1~357
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d3931e94a76491111a6e391e111cb066236cff4;p=thirdparty%2FPython%2Fcpython.git

gh-104012: Ensure test_calendar.CalendarTestCase.test_deprecation_warning consistently passes (#104014)
---

diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index 03388e8c55d5..24e472b5fee8 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -493,11 +493,11 @@ class OutputTestCase(unittest.TestCase):
 class CalendarTestCase(unittest.TestCase):
 
     def test_deprecation_warning(self):
-        with warnings.catch_warnings(record=True) as w:
+        with self.assertWarnsRegex(
+            DeprecationWarning,
+            "The 'January' attribute is deprecated, use 'JANUARY' instead"
+        ):
             calendar.January
-        self.assertEqual(len(w), 1)
-        self.assertEqual(w[0].category, DeprecationWarning)
-        self.assertIn("The 'January' attribute is deprecated, use 'JANUARY' instead", str(w[0].message))
 
     def test_isleap(self):
         # Make sure that the return is right for a few years, and