diff options
author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-24 11:29:49 +0000 |
---|---|---|
committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-24 11:29:49 +0000 |
commit | 6f8d3709dac0cd20c01d46cf6e890e07eaf081a2 (patch) | |
tree | 7810931a0decf52eeca7aefa6f63a8131e921459 | |
parent | 0ee5c9b7feed8c091f9b770225ae218d1022c449 (diff) | |
download | ruby-6f8d3709dac0cd20c01d46cf6e890e07eaf081a2.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | test/rinda/test_rinda.rb | 6 |
2 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,18 @@ +Fri Jul 24 20:09:43 2015 Naohisa Goto <ngotogenome@gmail.com> + + * 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. + Fri Jul 24 16:35:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (fstr_update_callback): pool bare strings only. 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 |