Bug 908296 - Upgrade psutil to version 1.0.1; rs=glandium

Archive obtained from
https://psutil.googlecode.com/files/psutil-1.0.1.tar.gz and extracted
over existing source code without modifications.
This commit is contained in:
Gregory Szorc
2013-08-22 23:36:57 -07:00
parent 94e359dda6
commit 9fb86d2ef8
53 changed files with 3201 additions and 669 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python
# Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -16,13 +16,10 @@ import os
import psutil
from psutil._compat import PY3
from test_psutil import DEVNULL
from test_psutil import (reap_children, get_test_subprocess, sh, which,
skipUnless)
from test_psutil import *
PAGESIZE = os.sysconf("SC_PAGE_SIZE")
TOLERANCE = 200 * 1024 # 200 KB
MUSE_AVAILABLE = which('muse')
@@ -56,14 +53,6 @@ class BSDSpecificTestCase(unittest.TestCase):
def tearDown(self):
reap_children()
def assert_eq_w_tol(self, first, second, tolerance):
difference = abs(first - second)
if difference <= tolerance:
return
msg = '%r != %r within %r delta (%r difference)' \
% (first, second, tolerance, difference)
raise AssertionError(msg)
def test_BOOT_TIME(self):
s = sysctl('sysctl kern.boottime')
s = s[s.find(" sec = ") + 7:]
@@ -130,69 +119,98 @@ class BSDSpecificTestCase(unittest.TestCase):
syst = sysctl("sysctl vm.stats.vm.v_page_count") * PAGESIZE
self.assertEqual(psutil.virtual_memory().total, syst)
@retry_before_failing()
def test_vmem_active(self):
syst = sysctl("vm.stats.vm.v_active_count") * PAGESIZE
self.assert_eq_w_tol(psutil.virtual_memory().active, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().active, syst,
delta=TOLERANCE)
@retry_before_failing()
def test_vmem_inactive(self):
syst = sysctl("vm.stats.vm.v_inactive_count") * PAGESIZE
self.assert_eq_w_tol(psutil.virtual_memory().inactive, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().inactive, syst,
delta=TOLERANCE)
@retry_before_failing()
def test_vmem_wired(self):
syst = sysctl("vm.stats.vm.v_wire_count") * PAGESIZE
self.assert_eq_w_tol(psutil.virtual_memory().wired, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().wired, syst,
delta=TOLERANCE)
@retry_before_failing()
def test_vmem_cached(self):
syst = sysctl("vm.stats.vm.v_cache_count") * PAGESIZE
self.assert_eq_w_tol(psutil.virtual_memory().cached, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().cached, syst,
delta=TOLERANCE)
@retry_before_failing()
def test_vmem_free(self):
syst = sysctl("vm.stats.vm.v_free_count") * PAGESIZE
self.assert_eq_w_tol(psutil.virtual_memory().free, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().free, syst,
delta=TOLERANCE)
@retry_before_failing()
def test_vmem_buffers(self):
syst = sysctl("vfs.bufspace")
self.assert_eq_w_tol(psutil.virtual_memory().buffers, syst, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().buffers, syst,
delta=TOLERANCE)
# --- virtual_memory(); tests against muse
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
def test_total(self):
num = muse('Total')
self.assertEqual(psutil.virtual_memory().total, num)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_active(self):
num = muse('Active')
self.assert_eq_w_tol(psutil.virtual_memory().active, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().active, num,
delta=TOLERANCE)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_inactive(self):
num = muse('Inactive')
self.assert_eq_w_tol(psutil.virtual_memory().inactive, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().inactive, num,
delta=TOLERANCE)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_wired(self):
num = muse('Wired')
self.assert_eq_w_tol(psutil.virtual_memory().wired, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().wired, num,
delta=TOLERANCE)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_cached(self):
num = muse('Cache')
self.assert_eq_w_tol(psutil.virtual_memory().cached, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().cached, num,
delta=TOLERANCE)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_free(self):
num = muse('Free')
self.assert_eq_w_tol(psutil.virtual_memory().free, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().free, num,
delta=TOLERANCE)
@skipUnless(MUSE_AVAILABLE)
@unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@retry_before_failing()
def test_buffers(self):
num = muse('Buffer')
self.assert_eq_w_tol(psutil.virtual_memory().buffers, num, TOLERANCE)
self.assertAlmostEqual(psutil.virtual_memory().buffers, num,
delta=TOLERANCE)
if __name__ == '__main__':
def test_main():
test_suite = unittest.TestSuite()
test_suite.addTest(unittest.makeSuite(BSDSpecificTestCase))
unittest.TextTestRunner(verbosity=2).run(test_suite)
result = unittest.TextTestRunner(verbosity=2).run(test_suite)
return result.wasSuccessful()
if __name__ == '__main__':
if not test_main():
sys.exit(1)