merge heads

orsenthil · orsenthil · commit 19a9af3cab55 · 2012-07-08T01:33:19.000-07:00
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -3202,28 +3202,28 @@ class SendrecvmsgUDP6TestBase(SendrecvmsgDgramFlagsBase,
     pass
 
 @requireAttrs(socket.socket, "sendmsg")
-@unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')
 @requireSocket("AF_INET6", "SOCK_DGRAM")
 @unittest.skipUnless(thread, 'Threading required for this test.')
 class SendmsgUDP6Test(SendmsgConnectionlessTests, SendrecvmsgUDP6TestBase):
     pass
 
 @requireAttrs(socket.socket, "recvmsg")
-@unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')
 @requireSocket("AF_INET6", "SOCK_DGRAM")
 @unittest.skipUnless(thread, 'Threading required for this test.')
 class RecvmsgUDP6Test(RecvmsgTests, SendrecvmsgUDP6TestBase):
     pass
 
 @requireAttrs(socket.socket, "recvmsg_into")
-@unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')
 @requireSocket("AF_INET6", "SOCK_DGRAM")
 @unittest.skipUnless(thread, 'Threading required for this test.')
 class RecvmsgIntoUDP6Test(RecvmsgIntoTests, SendrecvmsgUDP6TestBase):
     pass
 
 @requireAttrs(socket.socket, "recvmsg")
-@unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')
 @requireAttrs(socket, "IPPROTO_IPV6")
 @requireSocket("AF_INET6", "SOCK_DGRAM")
 @unittest.skipUnless(thread, 'Threading required for this test.')
@@ -3232,7 +3232,7 @@ class RecvmsgRFC3542AncillaryUDP6Test(RFC3542AncillaryTest,
     pass
 
 @requireAttrs(socket.socket, "recvmsg_into")
-@unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')
 @requireAttrs(socket, "IPPROTO_IPV6")
 @requireSocket("AF_INET6", "SOCK_DGRAM")
 @unittest.skipUnless(thread, 'Threading required for this test.')
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -93,6 +93,9 @@ Tools/Demos
 Tests
 -----
 
+- Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not
+  enabled. Patch by Brian Brazil.
+
 - Issue #15277: Fix a resource leak in support.py when IPv6 is disabled.
   Patch by Brian Brazil.
 
