THRIFT-229. rb: Don't block indefinitely on connect()
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@751142 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/socket_spec.rb b/lib/rb/spec/socket_spec.rb
index c5866ee..cd2fed4 100644
--- a/lib/rb/spec/socket_spec.rb
+++ b/lib/rb/spec/socket_spec.rb
@@ -9,28 +9,33 @@
@socket = Socket.new
@handle = mock("Handle", :closed? => false)
@handle.stub!(:close)
- TCPSocket.stub!(:new).and_return(@handle)
+ @handle.stub!(:connect_nonblock)
+ ::Socket.stub!(:new).and_return(@handle)
end
it_should_behave_like "a socket"
it "should raise a TransportException when it cannot open a socket" do
- TCPSocket.should_receive(:new).and_raise(StandardError)
+ ::Socket.should_receive(:new).and_raise(StandardError)
lambda { @socket.open }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
end
- it "should open a TCPSocket with default args" do
- TCPSocket.should_receive(:new).with('localhost', 9090)
+ it "should open a ::Socket with default args" do
+ ::Socket.should_receive(:new).and_return(mock("Handle", :connect_nonblock => true))
+ ::Socket.should_receive(:getaddrinfo).with("localhost", 9090).and_return([[]])
+ ::Socket.should_receive(:sockaddr_in)
@socket.open
end
it "should accept host/port options" do
- TCPSocket.should_receive(:new).with('my.domain', 1234)
+ ::Socket.should_receive(:new).and_return(mock("Handle", :connect_nonblock => true))
+ ::Socket.should_receive(:getaddrinfo).with("my.domain", 1234).and_return([[]])
+ ::Socket.should_receive(:sockaddr_in)
Socket.new('my.domain', 1234).open
end
it "should accept an optional timeout" do
- TCPSocket.stub!(:new)
+ ::Socket.stub!(:new)
Socket.new('localhost', 8080, 5).timeout.should == 5
end
end