trim ram in multidict_pop.py when testing item deletion so that bougus claims can be prevented. add types-psutil to pre-commit for typechecking the test

Author: Vizonex

.pre-commit-config.yaml

@@ -130,6 +130,8 @@ repos:
     - pytest_codspeed
     - Sphinx >= 5.3.0
     - sphinxcontrib-spelling
+    - types-psutil
+    - psutil
     args:
     - --python-version=3.13
     - --txt-report=.tox/.tmp/.mypy/python-3.13
@@ -146,6 +148,8 @@ repos:
     - pytest_codspeed
     - Sphinx >= 5.3.0
     - sphinxcontrib-spelling
+    - types-psutil
+    - psutil
     args:
     - --python-version=3.11
     - --txt-report=.tox/.tmp/.mypy/python-3.11

requirements/pytest.txt

@@ -2,4 +2,4 @@ objgraph==3.6.2
 pytest==8.4.0
 pytest-codspeed==3.2.0
 pytest-cov==6.1.0
-psutil==7.0.0
+psutil==7.0.0

tests/isolated/multidict_pop.py

@@ -1,19 +1,22 @@
 # Test for memory leaks surrounding deletion of values.
-# SEE: https://github.com/aio-libs/multidict/issues/1232 
-# We want to make sure that bad predictions or bougus claims 
-# can be prevented in the future.
+# SEE: https://github.com/aio-libs/multidict/issues/1232
+# We want to make sure that bad predictions or bougus claims
+# of memory leaks can be prevented in the future.
 
 import gc
 import sys
 import psutil
 import os
 import ctypes
 from multidict import MultiDict
+from typing import Optional
 
-# Code was borrowed for testing with windows
+
+# Code was borrowed for testing with windows and other operating systems respectively.
 # SEE: https://stackoverflow.com/a/79150440
 
-def trim_windows_process_memory(pid: int = None) -> bool:
+
+def trim_windows_process_memory(pid: Optional[int] = None) -> bool:
     """Causes effect similar to malloc_trim on -nix."""
 
     SIZE_T = ctypes.c_uint32 if ctypes.sizeof(ctypes.c_void_p) == 4 else ctypes.c_uint64
@@ -22,9 +25,9 @@ def trim_windows_process_memory(pid: int = None) -> bool:
     if not pid:
         pid = ctypes.windll.kernel32.GetCurrentProcess()
 
-    # Sometimes FileNotFoundError can appear so the code was 
+    # Sometimes FileNotFoundError can appear so the code was
     # changed to handle that workaround.
-    
+
     ctypes.windll.kernel32.SetProcessWorkingSetSizeEx.argtypes = [
         ctypes.c_void_p,  # Process handle
         SIZE_T,  # Minimum working set size
@@ -37,14 +40,15 @@ def trim_windows_process_memory(pid: int = None) -> bool:
     QUOTA_LIMITS_HARDWS_MIN_DISABLE = 0x00000002
 
     # Attempt to set the working set size
-    if not ctypes.windll.kernel32.SetProcessWorkingSetSizeEx(pid, SIZE_T(-1), SIZE_T(-1), QUOTA_LIMITS_HARDWS_MIN_DISABLE):
+    if not ctypes.windll.kernel32.SetProcessWorkingSetSizeEx(
+        pid, SIZE_T(-1), SIZE_T(-1), QUOTA_LIMITS_HARDWS_MIN_DISABLE
+    ):
         # Retrieve the error code
         error_code = ctypes.windll.kernel32.GetLastError()
         # let's print it since we aren't using a logger...
         print(f"SetProcessWorkingSetSizeEx failed with error code: {error_code}")
         return False
     return True
-    
 
 
 def trim_ram() -> None:
@@ -60,63 +64,69 @@ def trim_ram() -> None:
         except Exception as e:
             print(" attempt failed")
             raise e
-        
-def get_memory_usage():
+
+
+def get_memory_usage() -> int:
     process = psutil.Process(os.getpid())
     memory_info = process.memory_info()
-    return memory_info.rss / (1024 * 1024)
+    return memory_info.rss / (1024 * 1024)  # type: ignore[no-any-return]
+
 
 keys = [f"X-Any-{i}" for i in range(1000)]
 headers = {key: key * 2 for key in keys}
 
 
-def check_for_leak():
+def check_for_leak() -> None:
     trim_ram()
     usage = get_memory_usage()
     # We should never go over 100MB
     if usage > 100:
         sys.exit(1)
 
 
-def _test_pop():
+def _test_pop() -> None:
     for _ in range(10):
         for _ in range(1000):
             result = MultiDict(headers)
             for k in keys:
                 result.pop(k)
         check_for_leak()
 
-def _test_popall():
+
+def _test_popall() -> None:
     for _ in range(10):
         for _ in range(1000):
             result = MultiDict(headers)
             for k in keys:
                 result.popall(k)
         check_for_leak()
 
-def _test_popone():
+
+def _test_popone() -> None:
     for _ in range(10):
         for _ in range(1000):
             result = MultiDict(headers)
             for k in keys:
                 result.popone(k)
         check_for_leak()
 
-def _test_del():
+
+def _test_del() -> None:
     for _ in range(10):
         for _ in range(1000):
             result = MultiDict(headers)
             for k in keys:
                 del result[k]
         check_for_leak()
 
+
 def _run_isolated_case() -> None:
     _test_pop()
     _test_popall()
     _test_popone()
     _test_del()
     sys.exit(0)
 
+
 if __name__ == "__main__":
     _run_isolated_case()
-

tests/test_leaks.py

@@ -15,7 +15,7 @@
         "multidict_extend_multidict.py",
         "multidict_extend_tuple.py",
         "multidict_update_multidict.py",
-        "multidict_pop.py"
+        "multidict_pop.py",
     ),
 )
 @pytest.mark.leaks