summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-09 03:07:05 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-09 03:07:05 +0200
commit7828b9c1e4dd4fa5df5b0681850d81d24afdf015 (patch)
treec7cde9526b1b678cbe662a5a0788a6425fc0485b
parent53dbbfce60a92a36b571945c36958878fd50bcaf (diff)
downloadpsutil-7828b9c1e4dd4fa5df5b0681850d81d24afdf015.tar.gz
expose cache_info() method
-rw-r--r--psutil/_common.py5
-rwxr-xr-xpsutil/tests/test_misc.py4
2 files changed, 8 insertions, 1 deletions
diff --git a/psutil/_common.py b/psutil/_common.py
index 47d8cd09..67150a78 100644
--- a/psutil/_common.py
+++ b/psutil/_common.py
@@ -542,6 +542,10 @@ class _WrapNumbers:
self.reminders.pop(name)
self.reminder_keys.pop(name)
+ def cache_info(self):
+ with self.lock:
+ return (self.cache, self.reminders, self.reminder_keys)
+
def wrap_numbers(input_dict, name):
with _wn.lock:
@@ -550,3 +554,4 @@ def wrap_numbers(input_dict, name):
_wn = _WrapNumbers()
wrap_numbers.cache_clear = _wn.cache_clear
+wrap_numbers.cache_info = _wn.cache_info
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index 58f0ceb8..7f22ee54 100755
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -384,9 +384,11 @@ nt = namedtuple('foo', 'a b c')
class TestWrapNumbers(unittest.TestCase):
- def tearDown(self):
+ def setUp(self):
wrap_numbers.cache_clear()
+ tearDown = setUp
+
def test_first_call(self):
input = {'disk1': nt(5, 5, 5)}
self.assertEqual(wrap_numbers(input, 'disk_io'), input)