From 6f8d3709dac0cd20c01d46cf6e890e07eaf081a2 Mon Sep 17 00:00:00 2001 From: ngoto Date: Fri, 24 Jul 2015 11:29:49 +0000 Subject: * test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6): prevent to use IPv6 loopback interface for Rinda::TestRingFinger#test_make_socket_ipv6_multicast and Rinda::TestRingFinger#test_make_socket_ipv6_multicast_hops. The tests are skipped if there are no IPv6 devices other than the loopback device. [Bug #11394] [ruby-dev:49199] * test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast): ditto for Rinda::TestRingServer#test_make_socket_ipv6_multicast. * test/rinda/test_rinda.rb (test_ring_server_ipv6_multicast): ditto for Rinda::TestRingServer#test_ring_server_ipv6_multicast. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rinda/test_rinda.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/rinda') diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 812b437ead..8f78ca9f4f 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -547,7 +547,7 @@ module RingIPv6 rescue NotImplementedError # ifindex() function may not be implemented on Windows. return if - Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? } + Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? } end skip 'IPv6 not available' end @@ -636,7 +636,7 @@ class TestRingServer < Test::Unit::TestCase def test_make_socket_ipv6_multicast skip 'IPv6 not available' unless - Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? } + Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? } begin v6mc = @rs.make_socket('ff02::1') @@ -671,7 +671,7 @@ class TestRingServer < Test::Unit::TestCase def test_ring_server_ipv6_multicast skip 'IPv6 not available' unless - Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? } + Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? } @rs.shutdown begin -- cgit v1.2.3