diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/rinda/test_rinda.rb | 18 |
2 files changed, 18 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Mon Jun 24 22:26:31 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6): + ifindex() function may not be implemented on Windows. We use another + check for the case. + Mon Jun 24 22:11:37 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com> * test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_nolock): diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 570b6e21b8..25288d4b66 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -527,12 +527,18 @@ end module RingIPv6 def prepare_ipv6(r) - Socket.getifaddrs.each do |ifaddr| - next unless ifaddr.addr - next unless ifaddr.addr.ipv6_linklocal? - next if ifaddr.name[0, 2] == "lo" - r.multicast_interface = ifaddr.ifindex - return + begin + Socket.getifaddrs.each do |ifaddr| + next unless ifaddr.addr + next unless ifaddr.addr.ipv6_linklocal? + next if ifaddr.name[0, 2] == "lo" + r.multicast_interface = ifaddr.ifindex + return + end + rescue NotImplementedError + # ifindex() function may not be implemented on Windows. + return if + Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? } end skip 'IPv6 not available' end |