summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/rinda/test_rinda.rb4
-rw-r--r--version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e14efd6e78..1cde648e81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 15 03:09:39 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.
+
Tue Nov 15 02:49:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (vm_call0_body): follow the original class, not to
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
diff --git a/version.h b/version.h
index a471486454..495c5da648 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-11-15"
-#define RUBY_PATCHLEVEL 215
+#define RUBY_PATCHLEVEL 216
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11