diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-09 04:25:33 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-09 04:25:33 +0200 |
commit | 29ca4c2e11975decb7035582922ecada67a64c49 (patch) | |
tree | c8e85235c34031df9311120bd9ddf9e545d4d1f0 | |
parent | f56a5e8102fe2c2e37792ea1171507a242421651 (diff) | |
download | psutil-29ca4c2e11975decb7035582922ecada67a64c49.tar.gz |
add test
-rw-r--r-- | psutil/_common.py | 6 | ||||
-rwxr-xr-x | psutil/tests/test_misc.py | 20 |
2 files changed, 22 insertions, 4 deletions
diff --git a/psutil/_common.py b/psutil/_common.py index 3bca0799..6988eb8d 100644 --- a/psutil/_common.py +++ b/psutil/_common.py @@ -538,9 +538,9 @@ class _WrapNumbers: self.reminders.clear() self.reminder_keys.clear() else: - self.cache.pop(name) - self.reminders.pop(name) - self.reminder_keys.pop(name) + self.cache.pop(name, None) + self.reminders.pop(name, None) + self.reminder_keys.pop(name, None) def cache_info(self): with self.lock: diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index 676c7554..fe582a77 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -68,8 +68,12 @@ import psutil import psutil.tests +# =================================================================== +# --- Misc / generic tests. +# =================================================================== + + class TestMisc(unittest.TestCase): - """Misc / generic tests.""" def test_process__repr__(self, func=repr): p = psutil.Process() @@ -379,6 +383,11 @@ class TestMisc(unittest.TestCase): self.assertIn("version conflict", str(cm.exception).lower()) +# =================================================================== +# --- Tests for wrap_numbers() function. +# =================================================================== + + nt = namedtuple('foo', 'a b c') @@ -570,6 +579,15 @@ class TestWrapNumbers(unittest.TestCase): {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 0}}) self.assertEqual(cache[2], {'disk_io': {}}) + def test_cache_clear(self): + input = {'disk1': nt(5, 5, 5)} + wrap_numbers(input, 'disk_io') + wrap_numbers(input, 'disk_io') + wrap_numbers.cache_clear('disk_io') + self.assertEqual(wrap_numbers.cache_info(), ({}, {}, {})) + wrap_numbers.cache_clear('disk_io') + wrap_numbers.cache_clear('?!?') + # =================================================================== # --- Example script tests |