From efc3e32d6d7fb9bb41be73b80c8607b653c1fbd6 Mon Sep 17 00:00:00 2001 From: daniel a rios Date: Tue, 8 Oct 2019 11:02:40 +0200 Subject: Fixed #30759 -- Made cache.delete() return whether it succeeded. Thanks Simon Charette for the review. --- tests/cache/tests.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tests/cache') diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 1b2a9490f6..eebcaf6cb5 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -105,7 +105,7 @@ class DummyCacheTests(SimpleTestCase): "Cache deletion is transparently ignored on the dummy cache backend" cache.set_many({'key1': 'spam', 'key2': 'eggs'}) self.assertIsNone(cache.get("key1")) - cache.delete("key1") + self.assertFalse(cache.delete("key1")) self.assertIsNone(cache.get("key1")) self.assertIsNone(cache.get("key2")) @@ -315,10 +315,13 @@ class BaseCacheTests: # Cache keys can be deleted cache.set_many({'key1': 'spam', 'key2': 'eggs'}) self.assertEqual(cache.get("key1"), "spam") - cache.delete("key1") + self.assertTrue(cache.delete("key1")) self.assertIsNone(cache.get("key1")) self.assertEqual(cache.get("key2"), "eggs") + def test_delete_nonexistent(self): + self.assertFalse(cache.delete('nonexistent_key')) + def test_has_key(self): # The cache can be inspected for cache keys cache.set("hello1", "goodbye1") @@ -741,25 +744,25 @@ class BaseCacheTests: def test_cache_versioning_delete(self): cache.set('answer1', 37, version=1) cache.set('answer1', 42, version=2) - cache.delete('answer1') + self.assertTrue(cache.delete('answer1')) self.assertIsNone(cache.get('answer1', version=1)) self.assertEqual(cache.get('answer1', version=2), 42) cache.set('answer2', 37, version=1) cache.set('answer2', 42, version=2) - cache.delete('answer2', version=2) + self.assertTrue(cache.delete('answer2', version=2)) self.assertEqual(cache.get('answer2', version=1), 37) self.assertIsNone(cache.get('answer2', version=2)) cache.set('answer3', 37, version=1) cache.set('answer3', 42, version=2) - caches['v2'].delete('answer3') + self.assertTrue(caches['v2'].delete('answer3')) self.assertEqual(cache.get('answer3', version=1), 37) self.assertIsNone(cache.get('answer3', version=2)) cache.set('answer4', 37, version=1) cache.set('answer4', 42, version=2) - caches['v2'].delete('answer4', version=1) + self.assertTrue(caches['v2'].delete('answer4', version=1)) self.assertIsNone(cache.get('answer4', version=1)) self.assertEqual(cache.get('answer4', version=2), 42) -- cgit v1.3