From 49e1e456dca3a29ce6fcb7acc9d77397d2b08461 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 14 Nov 2016 18:54:47 +0000 Subject: merge revision(s) 56625: [Backport #12936] * 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/branches/ruby_2_2@56788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/rinda/test_rinda.rb | 4 ++++ version.h | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 571bd38f6d..4c282acb6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 15 03:54:14 2016 Shugo Maeda + + * 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 03:39:07 2016 NARUSE, Yui * lib/net/http.rb (transport_request): other than HTTPContinue diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 0f05abd829..3df4460cb8 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -793,6 +793,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) @@ -817,6 +819,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 696ec91930..cc2213fa19 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-11-15" -#define RUBY_PATCHLEVEL 393 +#define RUBY_PATCHLEVEL 394 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 11 -- cgit v1.2.3