From 96ec67a7cf89a136e793305343c5bba8521cdb47 Mon Sep 17 00:00:00 2001 From: Przemysław Suliga Date: Sun, 6 Mar 2016 11:34:23 +0100 Subject: Fixed #26332 -- Fixed a race condition in BaseCache.get_or_set(). --- tests/cache/tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/cache') diff --git a/tests/cache/tests.py b/tests/cache/tests.py index e3ae3d83ce..4a3d4bb128 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -30,7 +30,7 @@ from django.template import engines from django.template.context_processors import csrf from django.template.response import TemplateResponse from django.test import ( - RequestFactory, SimpleTestCase, TestCase, TransactionTestCase, + RequestFactory, SimpleTestCase, TestCase, TransactionTestCase, mock, override_settings, ) from django.test.signals import setting_changed @@ -931,6 +931,13 @@ class BaseCacheTests(object): self.assertEqual(cache.get_or_set('brian', 1979, version=2), 1979) self.assertIsNone(cache.get('brian', version=3)) + def test_get_or_set_racing(self): + with mock.patch('%s.%s' % (settings.CACHES['default']['BACKEND'], 'add')) as cache_add: + # Simulate cache.add() failing to add a value. In that case, the + # default value should be returned. + cache_add.return_value = False + self.assertEqual(cache.get_or_set('key', 'default'), 'default') + @override_settings(CACHES=caches_setting_for_tests( BACKEND='django.core.cache.backends.db.DatabaseCache', -- cgit v1.3