diff --git a/changedetectionio/tests/conftest.py b/changedetectionio/tests/conftest.py index 50f7104b..c1195bcb 100644 --- a/changedetectionio/tests/conftest.py +++ b/changedetectionio/tests/conftest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -import resource +import psutil import time from threading import Thread @@ -28,9 +28,10 @@ def reportlog(pytestconfig): def track_memory(memory_usage, ): + process = psutil.Process(os.getpid()) while not memory_usage["stop"]: - max_rss = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss - memory_usage["peak"] = max(memory_usage["peak"], max_rss) + current_rss = process.memory_info().rss + memory_usage["peak"] = max(memory_usage["peak"], current_rss) time.sleep(0.01) # Adjust the sleep time as needed @pytest.fixture(scope='function') diff --git a/requirements.txt b/requirements.txt index 6fbd5d56..9233680e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -110,5 +110,5 @@ tzdata pluggy ~= 1.5 - - +# Needed for testing, cross-platform for process and system monitoring +psutil==7.0.0