diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-18 16:51:29 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-18 16:51:29 +0200 |
commit | a6617589f21510d5480b442d37378bb3721c03d2 (patch) | |
tree | 521722a455b8e9b1fb109448878fe11f836b1e37 | |
parent | 6cce4e7542728de20ab597ae1cd43bed5b0b6df8 (diff) | |
download | psutil-a6617589f21510d5480b442d37378bb3721c03d2.tar.gz |
sunos: fix som connections tests
-rw-r--r-- | psutil/tests/__init__.py | 2 | ||||
-rwxr-xr-x | psutil/tests/test_connections.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 927e8cf6..ba7e1ce4 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -868,7 +868,7 @@ def create_sockets(): if supports_ipv6(): socks.append(bind_socket(socket.AF_INET6, socket.SOCK_STREAM)) socks.append(bind_socket(socket.AF_INET6, socket.SOCK_DGRAM)) - if POSIX: + if POSIX and HAS_CONNECTIONS_UNIX: fname1 = unix_socket_path().__enter__() fname2 = unix_socket_path().__enter__() s1, s2 = unix_socketpair(fname1) diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py index 83a5278a..aff3c8db 100755 --- a/psutil/tests/test_connections.py +++ b/psutil/tests/test_connections.py @@ -66,7 +66,7 @@ class Base(object): cons = thisproc.connections(kind='all') assert not cons, cons - def get_conn_from_socck(self, sock): + def get_conn_from_sock(self, sock): cons = thisproc.connections(kind='all') smap = dict([(c.fd, c) for c in cons]) if NETBSD: @@ -85,7 +85,7 @@ class Base(object): only (the one supposed to be checked). """ if conn is None: - conn = self.get_conn_from_socck(sock) + conn = self.get_conn_from_sock(sock) check_connection_ntuple(conn) # fd, family, type @@ -231,7 +231,7 @@ class TestConnectedSocketPairs(Base, unittest.TestCase): # a UNIX connection to /var/run/log. cons = [c for c in cons if c.raddr != '/var/run/log'] self.assertEqual(len(cons), 2) - if LINUX or FREEBSD: + if LINUX or FREEBSD or SUNOS: # remote path is never set self.assertEqual(cons[0].raddr, "") self.assertEqual(cons[1].raddr, "") |