diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 13:08:59 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 13:08:59 +0000 |
| commit | 975e43b8cb8d4cdd3e4ac126db894d1053cb8a02 (patch) | |
| tree | 1aca5b5ad7b77e5ff596446f94b70552b3cb8922 | |
| parent | 26cb14f846006ed4739af1153aae1f87e4678b3e (diff) | |
* test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface
which #addr method returns nil for venet0 in OpenVZ.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/rinda/test_rinda.rb | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat May 11 22:07:42 2013 Tanaka Akira <akr@fsij.org> + + * test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface + which #addr method returns nil for venet0 in OpenVZ. + Sat May 11 21:56:34 2013 Tanaka Akira <akr@fsij.org> * ext/socket/raddrinfo.c (rsock_inspect_sockaddr): Add casts to diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index e0da835d0f..1577af8405 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -533,9 +533,7 @@ end module RingIPv6 def prepare_ipv6(r) Socket.getifaddrs.each do |ifaddr| - p ifaddr - end - 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 |