summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2018-09-28 18:45:46 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2018-09-28 18:45:46 +0200
commit1a7512f337a61733c0523b4199aa392b48a22ad6 (patch)
treee8a6015a2800c3f5d29f17c22b9fb905b6e40959
parent1d7516c10cc89c60b8b5607ff9656d2f817b22b1 (diff)
downloadpsutil-1a7512f337a61733c0523b4199aa392b48a22ad6.tar.gz
use memory tolerance in occasionally failing test
-rw-r--r--CREDITS2
-rw-r--r--HISTORY.rst6
-rwxr-xr-xpsutil/tests/test_linux.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index bfb68627..a7e2dcbe 100644
--- a/CREDITS
+++ b/CREDITS
@@ -556,6 +556,6 @@ N: Lawrence Ye
W: https://github.com/LEAFERx
I: 1321
-N: yanok
+N: Ilya Yanok
W: https://github.com/yanok
I: 1332
diff --git a/HISTORY.rst b/HISTORY.rst
index 0c79a30a..b1226489 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,11 +7,11 @@ XXXX-XX-XX
**Bug fixes**
-- 1332_: psutil debug messages are erroneously printed all the time. (patch by
- yanok)
- 1294_: [Windows] psutil.Process().connections() may sometimes fail with
intermittent 0xC0000001. (patch by Sylvain Duchesne)
-
+- 1332_: [OSX] psutil debug messages are erroneously printed all the time.
+ (patch by Ilya Yanok)
+
5.4.7
=====
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index a0527851..a8e7a5e3 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -575,7 +575,7 @@ class TestSystemSwapMemory(unittest.TestCase):
total *= unit_multiplier
free *= unit_multiplier
self.assertEqual(swap.total, total)
- self.assertEqual(swap.free, free)
+ self.assertEqual(swap.free, free, delta=MEMORY_TOLERANCE)
def test_emulate_meminfo_has_no_metrics(self):
# Emulate a case where /proc/meminfo provides no swap metrics