summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rinda/test_rinda.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 485aa108d42..f0a7a908046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e0da835d0f1..1577af8405a 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