Minor test corrections and cleanups.

Author: tkem

tests/test_classmethod.py

@@ -75,7 +75,7 @@ def test_typed(self):
             self.assertEqual(Cached.get_typed(0), 1)
         self.assertEqual(len(w), 2)
         self.assertIs(w[0].category, DeprecationWarning)
-        self.assertIs(w[0].category, DeprecationWarning)
+        self.assertIs(w[1].category, DeprecationWarning)
 
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
@@ -99,7 +99,7 @@ def test_locked(self):
             self.assertEqual(Cached.get_locked(0), 1)
         self.assertEqual(len(w), 2)
         self.assertIs(w[0].category, DeprecationWarning)
-        self.assertIs(w[0].category, DeprecationWarning)
+        self.assertIs(w[1].category, DeprecationWarning)
 
     def test_condition(self):
         Cached.cache = LRUCache(2)
@@ -112,7 +112,7 @@ def test_condition(self):
             self.assertEqual(Cached.get_condition(0), 1)
         self.assertEqual(len(w), 2)
         self.assertIs(w[0].category, DeprecationWarning)
-        self.assertIs(w[0].category, DeprecationWarning)
+        self.assertIs(w[1].category, DeprecationWarning)
 
     def test_clear(self):
         Cached.cache = LRUCache(2)

tests/test_keys.py

@@ -34,7 +34,7 @@ def test_methodkey(self, key=cachetools.keys.methodkey):
         self.assertNotEqual(key("x", 1, 2, 3, x=0), key("x", 1, 2, 3, x=None))
         self.assertNotEqual(key("x", 1, 2, 3, x=0), key("x", 1, 2, 3, y=0))
         with self.assertRaises(TypeError):
-            hash("x", key({}))
+            hash(key("x", {}))
         # untyped keys compare equal
         self.assertEqual(key("x", 1, 2, 3), key("y", 1.0, 2.0, 3.0))
         self.assertEqual(hash(key("x", 1, 2, 3)), hash(key("y", 1.0, 2.0, 3.0)))

tests/test_tlru.py

@@ -6,6 +6,10 @@
 from . import CacheTestMixin
 
 
+def default_ttu(_key, _value, _time):
+    return math.inf
+
+
 class Timer:
     def __init__(self, auto=False):
         self.auto = auto
@@ -21,9 +25,6 @@ def tick(self):
 
 
 class TLRUTestCache(TLRUCache):
-    def default_ttu(_key, _value, _time):
-        return math.inf
-
     def __init__(self, maxsize, ttu=default_ttu, **kwargs):
         TLRUCache.__init__(self, maxsize, ttu, timer=Timer(), **kwargs)