fix python bug #30205: socket.getsockname() for a UNIX socket may return bytes instead of str

1 files changed, 4 insertions, 0 deletions

diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py
index da83ad5b..cb5807c4 100644
--- a/psutil/tests/test_connections.py
+++ b/psutil/tests/test_connections.py
@@ -23,6 +23,7 @@ from psutil import SUNOS
 from psutil import WINDOWS
 from psutil._common import supports_ipv6
 from psutil._compat import nested
+from psutil._compat import PY3
 from psutil.tests import AF_UNIX
 from psutil.tests import bind_socket
 from psutil.tests import bind_unix_socket
@@ -102,6 +103,9 @@ class Base(object):
 
         # local address
         laddr = sock.getsockname()
+        if not laddr and PY3 and isinstance(laddr, bytes):
+            # See: http://bugs.python.org/issue30205
+            laddr = laddr.decode()
         if sock.family == AF_INET6:
             laddr = laddr[:2]
         self.assertEqual(conn.laddr, laddr)