[Python-checkins] cpython (merge default -> default): merge heads

[senthil.kumaran]

http://hg.python.org/cpython/rev/163b6d6036ed
changeset:   77991:163b6d6036ed
parent:      77990:3a47aa5b3285
parent:      77988:b71dc2e9e00d
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 08 01:33:19 2012 -0700
summary:
  merge heads

files:
  Lib/test/test_socket.py |  10 +++++-----
  Misc/NEWS               |   3 +++
  2 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -3202,28 +3202,28 @@
     pass
 
 @requireAttrs(socket.socket, "sendmsg")
- at unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+ at 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")
- at unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+ at 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")
- at unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+ at 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")
- at unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+ at 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 @@
     pass
 
 @requireAttrs(socket.socket, "recvmsg_into")
- at unittest.skipUnless(socket.has_ipv6, "Python not built with IPv6 support")
+ at 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -93,6 +93,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython