summaryrefslogtreecommitdiff
path: root/spec/rubyspec/library/socket/tcpserver/accept_spec.rb
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 12:48:52 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 12:48:52 +0000
commit2bdce358e6ac0e1a17565419f07dec6ed0e0f388 (patch)
tree4ad06cb108c8b71fc1db7144eb61d0274a5aa26e /spec/rubyspec/library/socket/tcpserver/accept_spec.rb
parent5ccf36c7ec8687199424d0966374343477ad55f8 (diff)
Update to ruby/spec@cd1b911
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/rubyspec/library/socket/tcpserver/accept_spec.rb')
-rw-r--r--spec/rubyspec/library/socket/tcpserver/accept_spec.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/spec/rubyspec/library/socket/tcpserver/accept_spec.rb b/spec/rubyspec/library/socket/tcpserver/accept_spec.rb
index cf1fbbd873..f7b017d014 100644
--- a/spec/rubyspec/library/socket/tcpserver/accept_spec.rb
+++ b/spec/rubyspec/library/socket/tcpserver/accept_spec.rb
@@ -4,7 +4,8 @@ require File.expand_path('../../fixtures/classes', __FILE__)
describe "TCPServer#accept" do
before :each do
- @server = TCPServer.new("127.0.0.1", SocketSpecs.port)
+ @server = TCPServer.new("127.0.0.1", 0)
+ @port = @server.addr[1]
end
after :each do
@@ -22,7 +23,7 @@ describe "TCPServer#accept" do
end
Thread.pass while t.status and t.status != "sleep"
- socket = TCPSocket.new('127.0.0.1', SocketSpecs.port)
+ socket = TCPSocket.new('127.0.0.1', @port)
socket.write('hello')
socket.shutdown(1) # we are done with sending
socket.read.should == 'goodbye'
@@ -38,14 +39,12 @@ describe "TCPServer#accept" do
# kill thread, ensure it dies in a reasonable amount of time
t.kill
- a = 1
- while a < 2000
- break unless t.alive?
- Thread.pass
- sleep 0.2
+ a = 0
+ while t.alive? and a < 5000
+ sleep 0.001
a += 1
end
- a.should < 2000
+ a.should < 5000
end
it "can be interrupted by Thread#raise" do