From 031a082d41ed86a75e5a0b53d9fcdfb3e3a6589f Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 5 Jun 2020 07:21:52 +0200 Subject: [3.1.x] Fixed #31654 -- Fixed cache key validation messages. Backport of 926148ef019abcac3a9988c78734d9336d69f24e from master --- tests/cache/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/cache') diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 1f0abc8434..9682cd44ee 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -637,8 +637,9 @@ class BaseCacheTests: cache.key_func = func try: - with self.assertWarnsMessage(CacheKeyWarning, expected_warning): + with self.assertWarns(CacheKeyWarning) as cm: cache.set(key, 'value') + self.assertEqual(str(cm.warning), expected_warning) finally: cache.key_func = old_func @@ -1276,8 +1277,9 @@ class BaseMemcachedTests(BaseCacheTests): invalid key. """ msg = expected_warning.replace(key, cache.make_key(key)) - with self.assertRaisesMessage(InvalidCacheKey, msg): + with self.assertRaises(InvalidCacheKey) as cm: cache.set(key, 'value') + self.assertEqual(str(cm.exception), msg) def test_default_never_expiring_timeout(self): # Regression test for #22845 -- cgit v1.3