diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-05 10:19:29 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-05 10:19:29 +0000 |
commit | c1f0daeb6ac5c5414c9a4a58bb778a118006ae1f (patch) | |
tree | d7be3ffd935c20c2136559de28424a2ef06c560c /spec | |
parent | 920b924e5652884064a9529ffbd80d458a46fbc6 (diff) | |
download | ruby-c1f0daeb6ac5c5414c9a4a58bb778a118006ae1f.tar.gz |
Make sure to wait with IO.select before using Socket#accept_nonblock and recvfrom_nonblock
* On all platforms, as this is the recommended code pattern.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r-- | spec/ruby/library/socket/socket/accept_nonblock_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb index 3ef219ed05..cde9e6a4b6 100644 --- a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb +++ b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb @@ -86,8 +86,6 @@ describe 'Socket#accept_nonblock' do @client = Socket.new(family, :STREAM, 0) @client.connect(addr) - - platform_is(:darwin, :freebsd, :solaris) { IO.select([@server]) } end after do @@ -96,6 +94,7 @@ describe 'Socket#accept_nonblock' do end it 'returns an Array containing a Socket and an Addrinfo' do + IO.select([@server]) @socket, addrinfo = @server.accept_nonblock @socket.should be_an_instance_of(Socket) @@ -104,6 +103,7 @@ describe 'Socket#accept_nonblock' do describe 'the returned Addrinfo' do before do + IO.select([@server]) @socket, @addr = @server.accept_nonblock end diff --git a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb index 015109a052..62bbaf0dc9 100644 --- a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb +++ b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb @@ -40,16 +40,16 @@ describe 'UDPSocket#recvfrom_nonblock' do describe 'with data available' do before do @client.write('hello') - - platform_is(:darwin, :freebsd) { IO.select([@server]) } end it 'returns an Array containing the data and an Array' do + IO.select([@server]) @server.recvfrom_nonblock(1).should be_an_instance_of(Array) end describe 'the returned Array' do before do + IO.select([@server]) @array = @server.recvfrom_nonblock(1) end @@ -64,6 +64,7 @@ describe 'UDPSocket#recvfrom_nonblock' do describe 'the returned address Array' do before do + IO.select([@server]) @addr = @server.recvfrom_nonblock(1)[1] end |