From 59d8550c147795c6ab89535f719fbf6c8c40d2d5 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Thu, 13 Apr 2023 20:52:09 +0000 Subject: fix NetBSD test failure + add test for cached mem Signed-off-by: Giampaolo Rodola --- psutil/tests/test_bsd.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/psutil/tests/test_bsd.py b/psutil/tests/test_bsd.py index 1ce54b19..69f50732 100755 --- a/psutil/tests/test_bsd.py +++ b/psutil/tests/test_bsd.py @@ -127,6 +127,7 @@ class BSDTestCase(PsutilTestCase): self.assertEqual(psutil.cpu_count(logical=True), syst) @unittest.skipIf(not which('sysctl'), "sysctl cmd not available") + @unittest.skipIf(NETBSD, "skipped on NETBSD") # we check /proc/meminfo def test_virtual_memory_total(self): num = sysctl('hw.physmem') self.assertEqual(num, psutil.virtual_memory().total) @@ -508,6 +509,8 @@ class NetBSDTestCase(PsutilTestCase): return int(line.split()[1]) * 1024 raise ValueError("can't find %s" % look_for) + # --- virtual mem + def test_vmem_total(self): self.assertEqual( psutil.virtual_memory().total, self.parse_meminfo("MemTotal:")) @@ -527,6 +530,13 @@ class NetBSDTestCase(PsutilTestCase): psutil.virtual_memory().shared, self.parse_meminfo("MemShared:"), delta=TOLERANCE_SYS_MEM) + def test_vmem_cached(self): + self.assertAlmostEqual( + psutil.virtual_memory().cached, self.parse_meminfo("Cached:"), + delta=TOLERANCE_SYS_MEM) + + # --- swap mem + def test_swapmem_total(self): self.assertAlmostEqual( psutil.swap_memory().total, self.parse_meminfo("SwapTotal:"), @@ -541,6 +551,8 @@ class NetBSDTestCase(PsutilTestCase): smem = psutil.swap_memory() self.assertEqual(smem.used, smem.total - smem.free) + # --- others + def test_cpu_stats_interrupts(self): with open('/proc/stat', 'rb') as f: for line in f: -- cgit v1.2.1