diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-09-10 18:57:32 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-09-10 18:57:32 +0200 |
| commit | 47d30e3d6a12e1bde0f9034063326a8ecb7146fe (patch) | |
| tree | 2418d2567ab248641ae80799dae4aae09501446c | |
| parent | e71da4aebd80feb3c971ce820011d2363c495cd9 (diff) | |
| download | psutil-47d30e3d6a12e1bde0f9034063326a8ecb7146fe.tar.gz | |
linux tests refactoring
| -rw-r--r-- | psutil/tests/test_linux.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index f2c6b3f3..f7d91ff0 100644 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -138,9 +138,12 @@ def vmstat(stat): class TestSystemVirtualMemory(unittest.TestCase): def test_total(self): - free_value, _, _, _ = free_physmem() + # free_value, _, _, _ = free_physmem() + # psutil_value = psutil.virtual_memory().total + # self.assertEqual(free_value, psutil_value) + vmstat_value = vmstat('total memory') * 1024 psutil_value = psutil.virtual_memory().total - self.assertEqual(free_value, psutil_value) + self.assertAlmostEqual(vmstat_value, psutil_value) @retry_before_failing() def test_used(self): @@ -151,10 +154,14 @@ class TestSystemVirtualMemory(unittest.TestCase): @retry_before_failing() def test_free(self): - _, _, free_value, _ = free_physmem() + # _, _, free_value, _ = free_physmem() + # psutil_value = psutil.virtual_memory().free + # self.assertAlmostEqual( + # free_value, psutil_value, delta=MEMORY_TOLERANCE) + vmstat_value = vmstat('free memory') * 1024 psutil_value = psutil.virtual_memory().free self.assertAlmostEqual( - free_value, psutil_value, delta=MEMORY_TOLERANCE) + vmstat_value, psutil_value, delta=MEMORY_TOLERANCE) @retry_before_failing() def test_buffers(self): |