From fa9c63b211dda2721bd1144d2659755e86e3452e Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Sat, 12 Nov 2016 17:23:31 -0500 Subject: Actually test 'ignore_unhashable_args' feature. --- repoze/lru/tests.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/repoze/lru/tests.py b/repoze/lru/tests.py index 1408b89..1fe9c87 100644 --- a/repoze/lru/tests.py +++ b/repoze/lru/tests.py @@ -312,7 +312,8 @@ class ExpiringLRUCacheTests(LRUCacheTests): if default_timeout is None: return self._getTargetClass()(size) else: - return self._getTargetClass()(size, default_timeout=default_timeout) + return self._getTargetClass()( + size, default_timeout=default_timeout) def check_cache_is_consistent(self, cache): #Return if cache is consistent, else raise fail test case. @@ -494,8 +495,8 @@ class DecoratorTests(unittest.TestCase): from repoze.lru import lru_cache return lru_cache - def _makeOne(self, maxsize, cache, timeout=None): - return self._getTargetClass()(maxsize, timeout=timeout, cache=cache) + def _makeOne(self, *args, **kw): + return self._getTargetClass()(*args, **kw) def test_ctor_nocache(self): decorator = self._makeOne(10, None) @@ -546,20 +547,21 @@ class DecoratorTests(unittest.TestCase): return args, kwargs decorated = decorator(moreargs) result = decorated(3, 4, 5, a=1, b=2, c=3) - self.assertEqual(cache[((3, 4, 5), frozenset([ ('a',1), ('b',2), ('c',3) ]))], ((3, 4, 5), {'a':1, 'b':2, 'c':3})) + self.assertEqual( + cache[((3, 4, 5), frozenset([ ('a',1), ('b',2), ('c',3) ]))], + ((3, 4, 5), {'a':1, 'b':2, 'c':3})) self.assertEqual(result, ((3, 4, 5), {'a':1, 'b':2, 'c':3})) self.assertEqual(len(cache), 1) def test_multiargs_keywords_unhashable(self): cache = DummyLRUCache() - decorator = self._makeOne(0, cache) + decorator = self._makeOne(0, cache, ignore_unhashable_args=True) def moreargs(*args, **kwargs): return args, kwargs decorated = decorator(moreargs) - result = decorated(3, 4, 5, a=1, b=[1,2,3]) + result = decorated(3, 4, 5, a=1, b=[1, 2, 3]) self.assertEqual(len(cache), 0) - self.assertEqual(result, ((3, 4, 5), {'a':1, 'b':[1,2,3]})) - + self.assertEqual(result, ((3, 4, 5), {'a':1, 'b':[1, 2, 3]})) def test_expiry(self): #When timeout is given, decorator must eventually forget entries -- cgit v1.2.1