diff --git a/CREDITS b/CREDITS index 4affa0f9e..fea9143ed 100644 --- a/CREDITS +++ b/CREDITS @@ -486,7 +486,7 @@ I: 1042, 1079 N: Oleksii Shevchuk W: https://github.com/alxchk -I: 1077, 1093, 1091, 1220 +I: 1077, 1093, 1091, 1220, 1346 N: Prodesire W: https://github.com/Prodesire diff --git a/HISTORY.rst b/HISTORY.rst index feb42ad4d..3a22133ae 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -17,6 +17,8 @@ XXXX-XX-XX intermittent 0xC0000001. (patch by Sylvain Duchesne) - 1332_: [OSX] psutil debug messages are erroneously printed all the time. (patch by Ilya Yanok) +- 1346_: [SunOS] net_connections() returns an empty list. (patch by Oleksii + Shevchuk) 5.4.7 ===== diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index 299c110fe..c162666c2 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -575,7 +575,7 @@ def test_meminfo_against_sysinfo(self): total *= unit_multiplier free *= unit_multiplier self.assertEqual(swap.total, total) - self.assertEqual(swap.free, free, delta=MEMORY_TOLERANCE) + self.assertAlmostEqual(swap.free, free, delta=MEMORY_TOLERANCE) def test_emulate_meminfo_has_no_metrics(self): # Emulate a case where /proc/meminfo provides no swap metrics @@ -1533,7 +1533,6 @@ def glob_mock(path): orig_open = open patch_point = 'builtins.open' if PY3 else '__builtin__.open' with mock.patch(patch_point, side_effect=open_mock): - with mock.patch('glob.glob', create=True, side_effect=glob_mock): temp = psutil.sensors_temperatures()['name'][0] self.assertEqual(temp.label, '')