fixes 4

rafie · rafie · commit 4831af286027 · 2021-12-08T13:09:34.000+02:00
diff --git a/tests/pytest/common.py b/tests/pytest/common.py
@@ -18,9 +18,9 @@ def handler(signum, frame):
 
 def envMem(env):
     pid = env.envRunner.masterProcess.pid
-    ps = paella.sh(f"ps u -p {pid}", join=False, lines=True)
-    f = re.split(r"\s*", ps[1].strip())
-    return {'vsz': int(f[4]), 'rss': int(f[5]) }
+    vms = psutil.Process(pid).memory_info().vms / 1024
+    rss = psutil.Process(pid).memory_info().rss / 1024
+    return {'vsz': vms, 'rss': rss }
 
 def checkEnvMem(env, expected_vsz=None, vsz0=0, threshold=0.1):
     if os.getenv('MEMINFO', '0') == '1':
diff --git a/tests/pytest/includes.py b/tests/pytest/includes.py
@@ -1,6 +1,7 @@
 
 import json
 import os
+import psutil
 import re
 import redis
 import signal
