Skip to content

Commit

Permalink
give credits to @alxchk for #1346 (sunOS)
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Oct 11, 2018
1 parent a790008 commit 15b00d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=====
Expand Down
3 changes: 1 addition & 2 deletions psutil/tests/test_linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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, '')
Expand Down

0 comments on commit 15b00d8

Please sign in to comment.