summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-06 03:04:33 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-06 03:04:33 +0000
commit8a2bd2b7f0a6eaa2059f917b127ae3877dccf6fc (patch)
tree4909a73a71df1f97ab0b09bc673500a9bfa6fee5
parent493e48897421d176a8faf0f0820323d79ecdf94a (diff)
* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast address is not available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/rinda/test_rinda.rb4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d2842c155a..39be4204e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 6 11:59:05 2016 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
+ test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast
+ address is not available.
+
Sun Nov 6 11:53:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/irb.rb (Binding#irb): new method like Binding#pry.
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index d41276e8ec..a07eac427c 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -794,6 +794,8 @@ class TestRingFinger < Test::Unit::TestCase
rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
+ rescue Errno::EADDRNOTAVAIL
+ return # IPv6 address for multicast not available
end
assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int)
@@ -818,6 +820,8 @@ class TestRingFinger < Test::Unit::TestCase
rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
+ rescue Errno::EADDRNOTAVAIL
+ return # IPv6 address for multicast not available
end
assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
ensure