diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-09-18 15:12:44 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-09-18 15:12:44 +0200 |
| commit | ea08d4cf941c23e1c16bba1e84e7f6e80207c5b5 (patch) | |
| tree | 63e11d8a2473b45825da5aa52a2ab6accc4c77fa | |
| parent | 1f53b4fbd4600d03dcaae01ad1485d1dd0825f6f (diff) | |
| download | psutil-ea08d4cf941c23e1c16bba1e84e7f6e80207c5b5.tar.gz | |
linux test refactoring
| -rw-r--r-- | psutil/tests/test_linux.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index dffacc72..f9a1478f 100644 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -117,8 +117,9 @@ def free_physmem(): if line.startswith('Mem'): total, used, free, shared = \ [int(x) for x in line.split()[1:5]] - nt = collections.namedtuple('free', 'total used free shared') - return nt(total, used, free, shared) + nt = collections.namedtuple( + 'free', 'total used free shared output') + return nt(total, used, free, shared, out) raise ValueError( "can't find 'Mem' in 'free' output:\n%s" % '\n'.join(lines)) @@ -150,10 +151,12 @@ class TestSystemVirtualMemory(unittest.TestCase): @retry_before_failing() def test_used(self): - free_value = free_physmem().used + free = free_physmem() + free_value = free.used psutil_value = psutil.virtual_memory().used self.assertAlmostEqual( - free_value, psutil_value, delta=MEMORY_TOLERANCE) + free_value, psutil_value, delta=MEMORY_TOLERANCE, + msg='%s %s \n%s' % (free_value, psutil_value, free.output)) @retry_before_failing() def test_free(self): @@ -190,12 +193,14 @@ class TestSystemVirtualMemory(unittest.TestCase): @retry_before_failing() @unittest.skipIf(TRAVIS, "fails on travis") def test_shared(self): - free_value = free_physmem().shared + free = free_physmem() + free_value = free.shared if free_value == 0: raise unittest.SkipTest("free does not support 'shared' column") psutil_value = psutil.virtual_memory().shared self.assertAlmostEqual( - free_value, psutil_value, delta=MEMORY_TOLERANCE) + free_value, psutil_value, delta=MEMORY_TOLERANCE, + msg='%s %s \n%s' % (free_value, psutil_value, free.output)) # --- mocked tests |