diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 14:25:00 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 14:25:00 +0000 |
commit | 8180b5bfc0fe4d4b91b590de9110687294552a8f (patch) | |
tree | fb6b2270b710d2a8390a1cb0d0bb76b9cbc1c6ad /spec/ruby/library/socket | |
parent | a6413848153e6c37f6b0fea64e3e871460732e34 (diff) | |
download | ruby-8180b5bfc0fe4d4b91b590de9110687294552a8f.tar.gz |
Update to ruby/spec@09fa86c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/library/socket')
-rw-r--r-- | spec/ruby/library/socket/basicsocket/connect_address_spec.rb | 58 | ||||
-rw-r--r-- | spec/ruby/library/socket/fixtures/classes.rb | 2 |
2 files changed, 31 insertions, 29 deletions
diff --git a/spec/ruby/library/socket/basicsocket/connect_address_spec.rb b/spec/ruby/library/socket/basicsocket/connect_address_spec.rb index cb05d3bfe1..03e456b620 100644 --- a/spec/ruby/library/socket/basicsocket/connect_address_spec.rb +++ b/spec/ruby/library/socket/basicsocket/connect_address_spec.rb @@ -53,42 +53,44 @@ describe 'Socket#connect_address' do end end - describe 'using a socket bound to ::' do - before do - @sock = Socket.new(:INET6, :STREAM) - @sock.bind(Socket.sockaddr_in(0, '::')) - end + guard -> { SocketSpecs.ipv6_available? } do + describe 'using a socket bound to ::' do + before do + @sock = Socket.new(:INET6, :STREAM) + @sock.bind(Socket.sockaddr_in(0, '::')) + end - after do - @sock.close - end + after do + @sock.close + end - it 'returns an Addrinfo' do - @sock.connect_address.should be_an_instance_of(Addrinfo) - end + it 'returns an Addrinfo' do + @sock.connect_address.should be_an_instance_of(Addrinfo) + end - it 'uses ::1 as the IP address' do - @sock.connect_address.ip_address.should == '::1' - end + it 'uses ::1 as the IP address' do + @sock.connect_address.ip_address.should == '::1' + end - it 'uses the correct port number' do - @sock.connect_address.ip_port.should > 0 - end + it 'uses the correct port number' do + @sock.connect_address.ip_port.should > 0 + end - it 'uses AF_INET6 as the address family' do - @sock.connect_address.afamily.should == Socket::AF_INET6 - end + it 'uses AF_INET6 as the address family' do + @sock.connect_address.afamily.should == Socket::AF_INET6 + end - it 'uses PF_INET6 as the address family' do - @sock.connect_address.pfamily.should == Socket::PF_INET6 - end + it 'uses PF_INET6 as the address family' do + @sock.connect_address.pfamily.should == Socket::PF_INET6 + end - it 'uses SOCK_STREAM as the socket type' do - @sock.connect_address.socktype.should == Socket::SOCK_STREAM - end + it 'uses SOCK_STREAM as the socket type' do + @sock.connect_address.socktype.should == Socket::SOCK_STREAM + end - it 'uses 0 as the protocol' do - @sock.connect_address.protocol.should == 0 + it 'uses 0 as the protocol' do + @sock.connect_address.protocol.should == 0 + end end end diff --git a/spec/ruby/library/socket/fixtures/classes.rb b/spec/ruby/library/socket/fixtures/classes.rb index 1098b04a5e..8167b879fd 100644 --- a/spec/ruby/library/socket/fixtures/classes.rb +++ b/spec/ruby/library/socket/fixtures/classes.rb @@ -50,7 +50,7 @@ module SocketSpecs def self.ipv6_available? @ipv6_available ||= begin server = TCPServer.new('::1', 0) - rescue Errno::EADDRNOTAVAIL + rescue Errno::EADDRNOTAVAIL, SocketError :no else server.close |