1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6): prevent to use

Browse Source 
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
This commit is contained in:
ngoto 2015-07-24 11:29:49 +00:00
parent 0ee5c9b7fe
commit 6f8d3709da
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -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> Fri Jul 24 16:35:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (fstr_update_callback): pool bare strings only. * string.c (fstr_update_callback): pool bare strings only.

6
test/rinda/test_rinda.rb
View File

@ -547,7 +547,7 @@ module RingIPv6
rescue NotImplementedError rescue NotImplementedError
# ifindex() function may not be implemented on Windows. # ifindex() function may not be implemented on Windows.
return if return if
Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? } Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? }
end end
skip 'IPv6 not available' skip 'IPv6 not available'
end end
@ -636,7 +636,7 @@ class TestRingServer < Test::Unit::TestCase
def test_make_socket_ipv6_multicast def test_make_socket_ipv6_multicast
skip 'IPv6 not available' unless 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 begin
v6mc = @rs.make_socket('ff02::1') v6mc = @rs.make_socket('ff02::1')
@ -671,7 +671,7 @@ class TestRingServer < Test::Unit::TestCase
def test_ring_server_ipv6_multicast def test_ring_server_ipv6_multicast
skip 'IPv6 not available' unless 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 @rs.shutdown
begin begin