ruby-changes:52434
From: eregon <ko1@a...>
Date: Thu, 6 Sep 2018 05:39:07 +0900 (JST)
Subject: [ruby-changes:52434] eregon:r64643 (trunk): Guard a few specs which ipv6_available?
eregon 2018-09-06 05:39:02 +0900 (Thu, 06 Sep 2018) New Revision: 64643 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64643 Log: Guard a few specs which ipv6_available? Modified files: trunk/spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb trunk/spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb trunk/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb Index: spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb =================================================================== --- spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb (revision 64642) +++ spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb (revision 64643) @@ -1,18 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb#L1 require_relative '../spec_helper' -describe 'Addrinfo#ipv6_sitelocal?' do - it 'returns true for a site-local address' do - Addrinfo.ip('feef::').ipv6_sitelocal?.should == true - Addrinfo.ip('fee0::').ipv6_sitelocal?.should == true - Addrinfo.ip('fee2::').ipv6_sitelocal?.should == true - Addrinfo.ip('feef::1').ipv6_sitelocal?.should == true - end +guard -> { SocketSpecs.ipv6_available? } do + describe 'Addrinfo#ipv6_sitelocal?' do + it 'returns true for a site-local address' do + Addrinfo.ip('feef::').ipv6_sitelocal?.should == true + Addrinfo.ip('fee0::').ipv6_sitelocal?.should == true + Addrinfo.ip('fee2::').ipv6_sitelocal?.should == true + Addrinfo.ip('feef::1').ipv6_sitelocal?.should == true + end - it 'returns false for a regular IPv6 address' do - Addrinfo.ip('::1').ipv6_sitelocal?.should == false - end + it 'returns false for a regular IPv6 address' do + Addrinfo.ip('::1').ipv6_sitelocal?.should == false + end - it 'returns false for an IPv4 address' do - Addrinfo.ip('127.0.0.1').ipv6_sitelocal?.should == false + it 'returns false for an IPv4 address' do + Addrinfo.ip('127.0.0.1').ipv6_sitelocal?.should == false + end end end Index: spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb =================================================================== --- spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb (revision 64642) +++ spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb (revision 64643) @@ -1,66 +1,68 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb#L1 require_relative '../spec_helper' -describe 'Addrinfo#ipv6_to_ipv4' do - it 'returns an Addrinfo for ::192.168.1.1' do - addr = Addrinfo.ip('::192.168.1.1').ipv6_to_ipv4 +guard -> { SocketSpecs.ipv6_available? } do + describe 'Addrinfo#ipv6_to_ipv4' do + it 'returns an Addrinfo for ::192.168.1.1' do + addr = Addrinfo.ip('::192.168.1.1').ipv6_to_ipv4 - addr.should be_an_instance_of(Addrinfo) + addr.should be_an_instance_of(Addrinfo) - addr.afamily.should == Socket::AF_INET - addr.ip_address.should == '192.168.1.1' - end + addr.afamily.should == Socket::AF_INET + addr.ip_address.should == '192.168.1.1' + end - it 'returns an Addrinfo for ::0.0.1.1' do - addr = Addrinfo.ip('::0.0.1.1').ipv6_to_ipv4 + it 'returns an Addrinfo for ::0.0.1.1' do + addr = Addrinfo.ip('::0.0.1.1').ipv6_to_ipv4 - addr.should be_an_instance_of(Addrinfo) + addr.should be_an_instance_of(Addrinfo) - addr.afamily.should == Socket::AF_INET - addr.ip_address.should == '0.0.1.1' - end + addr.afamily.should == Socket::AF_INET + addr.ip_address.should == '0.0.1.1' + end - it 'returns an Addrinfo for ::0.0.1.0' do - addr = Addrinfo.ip('::0.0.1.0').ipv6_to_ipv4 + it 'returns an Addrinfo for ::0.0.1.0' do + addr = Addrinfo.ip('::0.0.1.0').ipv6_to_ipv4 - addr.should be_an_instance_of(Addrinfo) + addr.should be_an_instance_of(Addrinfo) - addr.afamily.should == Socket::AF_INET - addr.ip_address.should == '0.0.1.0' - end + addr.afamily.should == Socket::AF_INET + addr.ip_address.should == '0.0.1.0' + end - it 'returns an Addrinfo for ::0.1.0.0' do - addr = Addrinfo.ip('::0.1.0.0').ipv6_to_ipv4 + it 'returns an Addrinfo for ::0.1.0.0' do + addr = Addrinfo.ip('::0.1.0.0').ipv6_to_ipv4 - addr.should be_an_instance_of(Addrinfo) + addr.should be_an_instance_of(Addrinfo) - addr.afamily.should == Socket::AF_INET - addr.ip_address.should == '0.1.0.0' - end + addr.afamily.should == Socket::AF_INET + addr.ip_address.should == '0.1.0.0' + end - it 'returns an Addrinfo for ::ffff:192.168.1.1' do - addr = Addrinfo.ip('::ffff:192.168.1.1').ipv6_to_ipv4 + it 'returns an Addrinfo for ::ffff:192.168.1.1' do + addr = Addrinfo.ip('::ffff:192.168.1.1').ipv6_to_ipv4 - addr.should be_an_instance_of(Addrinfo) + addr.should be_an_instance_of(Addrinfo) - addr.afamily.should == Socket::AF_INET - addr.ip_address.should == '192.168.1.1' - end + addr.afamily.should == Socket::AF_INET + addr.ip_address.should == '192.168.1.1' + end - it 'returns nil for ::0.0.0.1' do - Addrinfo.ip('::0.0.0.1').ipv6_to_ipv4.should be_nil - end + it 'returns nil for ::0.0.0.1' do + Addrinfo.ip('::0.0.0.1').ipv6_to_ipv4.should be_nil + end - it 'returns nil for a pure IPv6 Addrinfo' do - Addrinfo.ip('::1').ipv6_to_ipv4.should be_nil - end + it 'returns nil for a pure IPv6 Addrinfo' do + Addrinfo.ip('::1').ipv6_to_ipv4.should be_nil + end - it 'returns nil for an IPv4 Addrinfo' do - Addrinfo.ip('192.168.1.1').ipv6_to_ipv4.should be_nil - end + it 'returns nil for an IPv4 Addrinfo' do + Addrinfo.ip('192.168.1.1').ipv6_to_ipv4.should be_nil + end - with_feature :unix_socket do - it 'returns nil for a UNIX Addrinfo' do - Addrinfo.unix('foo').ipv6_to_ipv4.should be_nil + with_feature :unix_socket do + it 'returns nil for a UNIX Addrinfo' do + Addrinfo.unix('foo').ipv6_to_ipv4.should be_nil + end end end end Index: spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb =================================================================== --- spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb (revision 64642) +++ spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb (revision 64643) @@ -1,18 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb#L1 require_relative '../spec_helper' -describe 'Addrinfo#ipv6_linklocal?' do - it 'returns true for a link-local address' do - Addrinfo.ip('fe80::').ipv6_linklocal?.should == true - Addrinfo.ip('fe81::').ipv6_linklocal?.should == true - Addrinfo.ip('fe8f::').ipv6_linklocal?.should == true - Addrinfo.ip('fe80::1').ipv6_linklocal?.should == true - end +guard -> { SocketSpecs.ipv6_available? } do + describe 'Addrinfo#ipv6_linklocal?' do + it 'returns true for a link-local address' do + Addrinfo.ip('fe80::').ipv6_linklocal?.should == true + Addrinfo.ip('fe81::').ipv6_linklocal?.should == true + Addrinfo.ip('fe8f::').ipv6_linklocal?.should == true + Addrinfo.ip('fe80::1').ipv6_linklocal?.should == true + end - it 'returns false for a regular address' do - Addrinfo.ip('::1').ipv6_linklocal?.should == false - end + it 'returns false for a regular address' do + Addrinfo.ip('::1').ipv6_linklocal?.should == false + end - it 'returns false for an IPv4 address' do - Addrinfo.ip('127.0.0.1').ipv6_linklocal?.should == false + it 'returns false for an IPv4 address' do + Addrinfo.ip('127.0.0.1').ipv6_linklocal?.should == false + end end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/