add more tests

Author: Fabien Coelho

README.md

@@ -5,7 +5,7 @@ on top of [cachetools](https://pypi.org/project/cachetools/),
 [redis](https://redis.io/) and [memcached](https://memcached.org/).
 
 ![Status](https://github.com/zx80/cachetools-utils/actions/workflows/ctu.yml/badge.svg?branch=main&style=flat)
-![Tests](https://img.shields.io/badge/tests-24%20✓-success)
+![Tests](https://img.shields.io/badge/tests-25%20✓-success)
 ![Coverage](https://img.shields.io/badge/coverage-100%25-success)
 ![Issues](https://img.shields.io/github/issues/zx80/cachetools-utils?style=flat)
 ![Python](https://img.shields.io/badge/python-3-informational)

test.py

@@ -3,6 +3,8 @@
 import sys
 import socket
 import importlib
+import random
+import threading
 import cachetools as ct
 import CacheToolsUtils as ctu
 import pytest
@@ -630,24 +632,17 @@ def m1(i: int):
     except Exception as e:
         assert "method: bad-method" in str(e)
 
-def test_nogil():
+def run_thread(cache, nthreads):
 
-    try:
-        if sys._is_gil_enabled():
-            pytest.skip("gil is enabled")
-    except AttributeError as e:
-        assert "_is_gil_enabled" in str(e)
-        pytest.skip("nogil not supported")
-
-    assert not sys._is_gil_enabled()
-
-    cache = ctu.StatsCache(ctu.DictCache())
+    cache.clear()
+    cache.reset()
+    assert len(cache) == 0
 
-    @ctu.cached(ctu.AutoPrefixedCache(cache))
+    @ctu.cached(cache=ctu.AutoPrefixedCache(cache))
     def repeat(s: str, n: int) -> str:
         return s * n
 
-    @ctu.cached(ctu.AutoPrefixedCache(cache))
+    @ctu.cached(cache=ctu.AutoPrefixedCache(cache))
     def banged(s: str, n: int) -> str:
         return repeat(s, n) + "!"
 
@@ -656,24 +651,49 @@ def banged(s: str, n: int) -> str:
     assert banged("a", 3) == "aaa!"  # hit
     assert cache.hits() == 0.5
 
-    # reset stats
+    cache.clear()
     cache.reset()
+    assert len(cache) == 0
+
+    barrier = threading.Barrier(nthreads, timeout=2)
+
+    LS, LI = ["a", "b", "c", "d"], list(range(4))
 
-    import threading
-    NTHREADS = 4
-    barrier = threading.Barrier(NTHREADS, timeout=2)
-    
     def run():
+        ls, li = LS.copy(), LI.copy()
+        random.shuffle(ls)
+        random.shuffle(li)
         barrier.wait()
-        for s in ("a", "b", "c"):
-            for n in range(3):
+        for s in ls:
+            for n in li:
+                barrier.wait()
                 assert banged(s, n) == s * n + "!"
         barrier.wait()
 
-    threads = [ threading.Thread(target=run, name=f"thread {i}") for i in range(NTHREADS) ] 
-    map(lambda t: t.start(), threads)
-    map(lambda t: t.join(), threads)
+    threads = [ threading.Thread(target=run, name=f"thread {i}") for i in range(nthreads) ]
+    list(map(lambda t: t.start(), threads))
+    list(map(lambda t: t.join(), threads))
+
+    assert len(cache) == 32
+    assert abs(cache.hits() - (1.0 / (nthreads + 1))) < 0.001
+
+def test_threads():
+    cache = ctu.StatsCache(ctu.DictCache())
+    run_thread(cache, 2)
+    del cache
+
+def test_nogil():
+    try:
+        if sys._is_gil_enabled():
+            pytest.skip("gil is enabled")
+    except AttributeError as e:
+        assert "_is_gil_enabled" in str(e)
+        pytest.skip("nogil not supported")
+
+    assert not sys._is_gil_enabled()
 
-    assert cache.hits() == 0.25
+    cache = ctu.LockedCache(ctu.StatsCache(ctu.DictCache()), threading.Lock())
+    run_thread(cache, 4)
+    del cache
 
     assert not sys._is_gil_enabled()