diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-11 22:04:40 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-11 22:04:40 +0100 |
commit | 500b80bcf7deb77ceeaa9165fa538e0f7ad134c8 (patch) | |
tree | 1251b977489e0128b51cf9fac2ccfb56830e5246 | |
parent | b77021bc220b046de6d4d449ab8101885de1b6a0 (diff) | |
download | psutil-500b80bcf7deb77ceeaa9165fa538e0f7ad134c8.tar.gz |
disable IPv6 tests if IPv6 is not supported
-rwxr-xr-x | psutil/tests/test_connections.py | 2 | ||||
-rwxr-xr-x | psutil/tests/test_misc.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py index d248af57..176e2664 100755 --- a/psutil/tests/test_connections.py +++ b/psutil/tests/test_connections.py @@ -152,6 +152,7 @@ class TestUnconnectedSockets(Base, unittest.TestCase): assert not conn.raddr self.assertEqual(conn.status, psutil.CONN_LISTEN) + @unittest.skipIf(not supports_ipv6(), "IPv6 not supported") def test_tcp_v6(self): addr = ("::1", get_free_port()) with closing(bind_socket(AF_INET6, SOCK_STREAM, addr=addr)) as sock: @@ -166,6 +167,7 @@ class TestUnconnectedSockets(Base, unittest.TestCase): assert not conn.raddr self.assertEqual(conn.status, psutil.CONN_NONE) + @unittest.skipIf(not supports_ipv6(), "IPv6 not supported") def test_udp_v6(self): addr = ("::1", get_free_port()) with closing(bind_socket(AF_INET6, SOCK_DGRAM, addr=addr)) as sock: diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index f7305a0d..7dc88735 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -1018,7 +1018,8 @@ class TestNetUtils(unittest.TestCase): # work around http://bugs.python.org/issue30204 types[s.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE)] += 1 self.assertGreaterEqual(fams[socket.AF_INET], 2) - self.assertGreaterEqual(fams[socket.AF_INET6], 2) + if supports_ipv6(): + self.assertGreaterEqual(fams[socket.AF_INET6], 2) if POSIX and HAS_CONNECTIONS_UNIX: self.assertGreaterEqual(fams[socket.AF_UNIX], 2) self.assertGreaterEqual(types[socket.SOCK_STREAM], 2) |