aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-20 00:40:48 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-20 00:40:48 +0000
commitf35b1d0633a6423f1281fb3c2b29aa522090976f (patch)
tree5077a53b866b2cbf162641eb4a5ba84dc7a16e31
parent3efea48a70180aa981011a79d9a8d07d520f4321 (diff)
downloadruby-f35b1d0633a6423f1281fb3c2b29aa522090976f.tar.gz
* test/socket/test_socket.rb: Ignore IPv6 unique local addresses on OS
X (iCloud Back to my Mac addresses) for test_udp_socket since they do not act as loopback addresses. [Bug #6692] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/socket/test_socket.rb2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 10da419ac6..ee10ba4dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 20 09:34:11 2012 Eric Hodel <drbrain@segment7.net>
+
+ * test/socket/test_socket.rb: Ignore IPv6 unique local addresses on OS
+ X (iCloud Back to my Mac addresses) for test_udp_socket since they do
+ not act as loopback addresses. [Bug #6692]
+
Fri Jul 20 09:32:14 2012 Eric Hodel <drbrain@segment7.net>
* ext/socket/raddrinfo.c (addrinfo_ipv6_unique_local_p): Added
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index df482f7f9a..eef86ea2b9 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -334,6 +334,8 @@ class TestSocket < Test::Unit::TestCase
end
when /darwin/
if !ai.ipv6?
+ elsif ai.ipv6_unique_local?
+ next true # iCloud addresses do not work, see Bug 6692
elsif ifr_name = ai.ip_address[/%(.*)/, 1]
# Mac OS X may sets IFDISABLED as FreeBSD does
ulSIOCGIFFLAGS = 3223349521