kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 56625: [Backport #12936]

Browse source 
* 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
This commit is contained in:
usa 2016-11-14 18:54:47 +00:00
parent bb5114bc7e
commit 49e1e456dc
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Nov 15 03:54:14 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 03:39:07 2016 NARUSE, Yui <naruse@ruby-lang.org> Tue Nov 15 03:39:07 2016 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (transport_request): other than HTTPContinue * lib/net/http.rb (transport_request): other than HTTPContinue

4
test/rinda/test_rinda.rb
View file

@ -793,6 +793,8 @@ class TestRingFinger < Test::Unit::TestCase
rescue Errno::EINVAL rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname # somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}") v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
rescue Errno::EADDRNOTAVAIL
return # IPv6 address for multicast not available
end end
assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int) assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int)
@ -817,6 +819,8 @@ class TestRingFinger < Test::Unit::TestCase
rescue Errno::EINVAL rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname # somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}") v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
rescue Errno::EADDRNOTAVAIL
return # IPv6 address for multicast not available
end end
assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int) assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
ensure ensure

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6" #define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-11-15" #define RUBY_RELEASE_DATE "2016-11-15"
#define RUBY_PATCHLEVEL 393 #define RUBY_PATCHLEVEL 394
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11