summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-11-25 19:37:56 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2015-11-25 19:37:56 +0100
commit1c20a66a1be79481f31bbcbea6e22b7edf1709c0 (patch)
tree5028e5bf4d36080967d4855d1574f1497bb55647
parent22c4200f377130eeb53b9ba077fe2323fcf035b6 (diff)
downloadpsutil-1c20a66a1be79481f31bbcbea6e22b7edf1709c0.tar.gz
add test for swap mem
-rw-r--r--psutil/arch/bsd/openbsd.c6
-rw-r--r--test/_openbsd.py12
2 files changed, 15 insertions, 3 deletions
diff --git a/psutil/arch/bsd/openbsd.c b/psutil/arch/bsd/openbsd.c
index 9fd52846..d7aa8972 100644
--- a/psutil/arch/bsd/openbsd.c
+++ b/psutil/arch/bsd/openbsd.c
@@ -339,9 +339,9 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
(unsigned long long) uvmexp.active * pagesize,
(unsigned long long) uvmexp.inactive * pagesize,
(unsigned long long) uvmexp.wired * pagesize,
- (unsigned long long) 0,
- (unsigned long long) 0,
- (unsigned long long) 0
+ (unsigned long long) 0, // cached
+ (unsigned long long) 0, // buffers
+ (unsigned long long) 0 // shared
);
}
diff --git a/test/_openbsd.py b/test/_openbsd.py
index b50b66a6..7b079cf6 100644
--- a/test/_openbsd.py
+++ b/test/_openbsd.py
@@ -92,6 +92,18 @@ class OpenBSDSpecificTestCase(unittest.TestCase):
syst = sysctl("hw.ncpu")
self.assertEqual(psutil.cpu_count(logical=True), syst)
+ def test_swap_memory(self):
+ out = sh("pstat -s")
+ _, total, used, free, _, _ = out.split('\n')[1].split()
+ smem = psutil.swap_memory()
+ self.assertEqual(smem.total, int(total) * 512)
+ self.assertEqual(smem.used, int(used) * 512)
+ self.assertEqual(smem.free, int(free) * 512)
+
+ # def test_virtual_memory(self):
+ # s = sysctl('hw.physmem')
+ # self.assertEqual(s, psutil.virtual_memory().total)
+
def main():
test_suite = unittest.TestSuite()