diff options
author | Benoit Daloze <eregontp@gmail.com> | 2019-05-30 22:11:24 +0200 |
---|---|---|
committer | Benoit Daloze <eregontp@gmail.com> | 2019-05-30 22:11:24 +0200 |
commit | a4161b7649c5aec6ff4d857863e0e829f9d7fde8 (patch) | |
tree | 4aeb4b74dc94f45c67993273dc3c18ca86f1cf51 /spec/ruby | |
parent | e935a3227d1553539f65d1475f2c161082ba7148 (diff) | |
download | ruby-a4161b7649c5aec6ff4d857863e0e829f9d7fde8.tar.gz |
Update to ruby/spec@0ba5312
Diffstat (limited to 'spec/ruby')
-rw-r--r-- | spec/ruby/library/socket/fixtures/classes.rb | 29 | ||||
-rw-r--r-- | spec/ruby/library/socket/socket/tcp_server_loop_spec.rb | 50 | ||||
-rw-r--r-- | spec/ruby/library/socket/socket/udp_server_loop_spec.rb | 8 |
3 files changed, 58 insertions, 29 deletions
diff --git a/spec/ruby/library/socket/fixtures/classes.rb b/spec/ruby/library/socket/fixtures/classes.rb index 6cc7ecb389..ebed66851d 100644 --- a/spec/ruby/library/socket/fixtures/classes.rb +++ b/spec/ruby/library/socket/fixtures/classes.rb @@ -132,4 +132,33 @@ module SocketSpecs @logger.puts message if @logger end end + + # We need to find a free port for Socket.tcp_server_loop and Socket.udp_server_loop, + # and the only reliable way to do that is to pass 0 as the port, but then we need to + # find out which one was chosen and the API doesn't let us find what it is. So we + # intercept one of the public API methods called by these methods. + class ServerLoopPortFinder < Socket + def self.tcp_server_sockets(*args) + super(*args) { |sockets| + @port = sockets.first.local_address.ip_port + yield(sockets) + } + end + + def self.udp_server_sockets(*args, &block) + super(*args) { |sockets| + @port = sockets.first.local_address.ip_port + yield(sockets) + } + end + + def self.cleanup + @port = nil + end + + def self.port + sleep 0.001 until @port + @port + end + end end diff --git a/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb b/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb index 603e7b3450..05ecad67d1 100644 --- a/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb +++ b/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb @@ -11,7 +11,7 @@ describe 'Socket.tcp_server_loop' do describe 'when a connection is available' do before do @client = Socket.new(:INET, :STREAM) - @port = 9998 + SocketSpecs::ServerLoopPortFinder.cleanup end after do @@ -19,38 +19,36 @@ describe 'Socket.tcp_server_loop' do @client.close end - # Not working since ruby/ruby a66bc2c01194a9c017c874a30db5b3b6bd95e966 - # https://travis-ci.org/ruby/ruby/jobs/538438184 - platform_is_not :darwin do - it 'yields a Socket and an Addrinfo' do - @sock, addr = nil + it 'yields a Socket and an Addrinfo' do + @sock, addr = nil - thread = Thread.new do - Socket.tcp_server_loop('127.0.0.1', @port) do |socket, addrinfo| - @sock = socket - addr = addrinfo + thread = Thread.new do + SocketSpecs::ServerLoopPortFinder.tcp_server_loop('127.0.0.1', 0) do |socket, addrinfo| + @sock = socket + addr = addrinfo - break - end + break end + end + + port = SocketSpecs::ServerLoopPortFinder.port - SocketSpecs.loop_with_timeout do - begin - @client.connect(Socket.sockaddr_in(@port, '127.0.0.1')) - rescue SystemCallError - sleep 0.01 - :retry - end + SocketSpecs.loop_with_timeout do + begin + @client.connect(Socket.sockaddr_in(port, '127.0.0.1')) + rescue SystemCallError + sleep 0.01 + :retry end + end - # At this point the connection has been set up but the thread may not yet - # have returned, thus we'll need to wait a little longer for it to - # complete. - thread.join(2) + # At this point the connection has been set up but the thread may not yet + # have returned, thus we'll need to wait a little longer for it to + # complete. + thread.join(2) - @sock.should be_an_instance_of(Socket) - addr.should be_an_instance_of(Addrinfo) - end + @sock.should be_an_instance_of(Socket) + addr.should be_an_instance_of(Addrinfo) end end end diff --git a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb index c6abfb4eb9..168c17545f 100644 --- a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb +++ b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb @@ -11,7 +11,7 @@ describe 'Socket.udp_server_loop' do describe 'when a connection is available' do before do @client = Socket.new(:INET, :DGRAM) - @port = 9997 + SocketSpecs::ServerLoopPortFinder.cleanup end after do @@ -22,7 +22,7 @@ describe 'Socket.udp_server_loop' do msg, src = nil Thread.new do - Socket.udp_server_loop('127.0.0.1', @port) do |message, source| + SocketSpecs::ServerLoopPortFinder.udp_server_loop('127.0.0.1', 0) do |message, source| msg = message src = source @@ -30,9 +30,11 @@ describe 'Socket.udp_server_loop' do end end + port = SocketSpecs::ServerLoopPortFinder.port + # Because this will return even if the server is up and running (it's UDP # after all) we'll have to write and wait until "msg" is set. - @client.connect(Socket.sockaddr_in(@port, '127.0.0.1')) + @client.connect(Socket.sockaddr_in(port, '127.0.0.1')) SocketSpecs.loop_with_timeout do begin |