diff options
Diffstat (limited to 'spec/rubyspec/library/socket/basicsocket')
8 files changed, 25 insertions, 21 deletions
diff --git a/spec/rubyspec/library/socket/basicsocket/close_read_spec.rb b/spec/rubyspec/library/socket/basicsocket/close_read_spec.rb index d0b73c88ad..c71e1acaf9 100644 --- a/spec/rubyspec/library/socket/basicsocket/close_read_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/close_read_spec.rb @@ -3,7 +3,7 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "Socket::BasicSocket#close_read" do before :each do - @server = TCPServer.new(SocketSpecs.port) + @server = TCPServer.new(0) end after :each do diff --git a/spec/rubyspec/library/socket/basicsocket/close_write_spec.rb b/spec/rubyspec/library/socket/basicsocket/close_write_spec.rb index 7cba1caa8f..a00f5d5870 100644 --- a/spec/rubyspec/library/socket/basicsocket/close_write_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/close_write_spec.rb @@ -3,7 +3,7 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "Socket::BasicSocket#close_write" do before :each do - @server = TCPServer.new(SocketSpecs.port) + @server = TCPServer.new(0) end after :each do diff --git a/spec/rubyspec/library/socket/basicsocket/do_not_reverse_lookup_spec.rb b/spec/rubyspec/library/socket/basicsocket/do_not_reverse_lookup_spec.rb index 0875c1eca1..3ef3a686e2 100644 --- a/spec/rubyspec/library/socket/basicsocket/do_not_reverse_lookup_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/do_not_reverse_lookup_spec.rb @@ -4,8 +4,9 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "BasicSocket.do_not_reverse_lookup" do before :each do @do_not_reverse_lookup = BasicSocket.do_not_reverse_lookup - @server = TCPServer.new('127.0.0.1', SocketSpecs.port) - @socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + @server = TCPServer.new('127.0.0.1', 0) + @port = @server.addr[1] + @socket = TCPSocket.new('127.0.0.1', @port) end after :each do @@ -21,7 +22,7 @@ describe "BasicSocket.do_not_reverse_lookup" do it "causes 'peeraddr' to avoid name lookups" do @socket.do_not_reverse_lookup = true BasicSocket.do_not_reverse_lookup = true - @socket.peeraddr.should == ["AF_INET", SocketSpecs.port, "127.0.0.1", "127.0.0.1"] + @socket.peeraddr.should == ["AF_INET", @port, "127.0.0.1", "127.0.0.1"] end it "looks for hostnames when set to false" do diff --git a/spec/rubyspec/library/socket/basicsocket/for_fd_spec.rb b/spec/rubyspec/library/socket/basicsocket/for_fd_spec.rb index 5ad1ea84d0..164e4dc93c 100644 --- a/spec/rubyspec/library/socket/basicsocket/for_fd_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/for_fd_spec.rb @@ -4,7 +4,7 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "BasicSocket#for_fd" do before :each do - @server = TCPServer.new(SocketSpecs.port) + @server = TCPServer.new(0) @s2 = nil end diff --git a/spec/rubyspec/library/socket/basicsocket/getpeername_spec.rb b/spec/rubyspec/library/socket/basicsocket/getpeername_spec.rb index 1edfbcd3ec..cecf590092 100644 --- a/spec/rubyspec/library/socket/basicsocket/getpeername_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/getpeername_spec.rb @@ -4,8 +4,9 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "Socket::BasicSocket#getpeername" do before :each do - @server = TCPServer.new("127.0.0.1", SocketSpecs.port) - @client = TCPSocket.new("127.0.0.1", SocketSpecs.port) + @server = TCPServer.new("127.0.0.1", 0) + @port = @server.addr[1] + @client = TCPSocket.new("127.0.0.1", @port) end after :each do @@ -14,7 +15,7 @@ describe "Socket::BasicSocket#getpeername" do end it "returns the sockaddr of the other end of the connection" do - server_sockaddr = Socket.pack_sockaddr_in(SocketSpecs.port, "127.0.0.1") + server_sockaddr = Socket.pack_sockaddr_in(@port, "127.0.0.1") @client.getpeername.should == server_sockaddr end diff --git a/spec/rubyspec/library/socket/basicsocket/getsockname_spec.rb b/spec/rubyspec/library/socket/basicsocket/getsockname_spec.rb index 6d30286733..8f8616bd2b 100644 --- a/spec/rubyspec/library/socket/basicsocket/getsockname_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/getsockname_spec.rb @@ -8,16 +8,16 @@ describe "Socket::BasicSocket#getsockname" do end it "returns the sockaddr associacted with the socket" do - @socket = TCPServer.new("127.0.0.1", SocketSpecs.port) + @socket = TCPServer.new("127.0.0.1", 0) sockaddr = Socket.unpack_sockaddr_in(@socket.getsockname) - sockaddr.should == [SocketSpecs.port, "127.0.0.1"] + sockaddr.should == [@socket.addr[1], "127.0.0.1"] end it "works on sockets listening in ipaddr_any" do - @socket = TCPServer.new(SocketSpecs.port) + @socket = TCPServer.new(0) sockaddr = Socket.unpack_sockaddr_in(@socket.getsockname) ["::", "0.0.0.0", "::ffff:0.0.0.0"].include?(sockaddr[1]).should be_true - sockaddr[0].should == SocketSpecs.port + sockaddr[0].should == @socket.addr[1] end it "returns empty sockaddr for unbinded sockets" do diff --git a/spec/rubyspec/library/socket/basicsocket/recv_spec.rb b/spec/rubyspec/library/socket/basicsocket/recv_spec.rb index 5ac274f6d8..5891bf9c87 100644 --- a/spec/rubyspec/library/socket/basicsocket/recv_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/recv_spec.rb @@ -5,7 +5,8 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "BasicSocket#recv" 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 @@ -23,7 +24,7 @@ describe "BasicSocket#recv" do Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil - socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + socket = TCPSocket.new('127.0.0.1', @port) socket.send('hello', 0) socket.close @@ -46,7 +47,7 @@ describe "BasicSocket#recv" do Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil - socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + socket = TCPSocket.new('127.0.0.1', @port) socket.send('helloU', Socket::MSG_OOB) socket.shutdown(1) t.join @@ -67,7 +68,7 @@ describe "BasicSocket#recv" do Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil - socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + socket = TCPSocket.new('127.0.0.1', @port) socket.write("firstline\377secondline\377") socket.close @@ -77,7 +78,7 @@ describe "BasicSocket#recv" do ruby_version_is "2.3" do it "allows an output buffer as third argument" do - socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + socket = TCPSocket.new('127.0.0.1', @port) socket.write("data") client = @server.accept diff --git a/spec/rubyspec/library/socket/basicsocket/send_spec.rb b/spec/rubyspec/library/socket/basicsocket/send_spec.rb index 7822f4696b..4df0d04a10 100644 --- a/spec/rubyspec/library/socket/basicsocket/send_spec.rb +++ b/spec/rubyspec/library/socket/basicsocket/send_spec.rb @@ -3,8 +3,9 @@ require File.expand_path('../../fixtures/classes', __FILE__) describe "BasicSocket#send" do before :each do - @server = TCPServer.new('127.0.0.1', SocketSpecs.port) - @socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) + @server = TCPServer.new('127.0.0.1', 0) + @port = @server.addr[1] + @socket = TCPSocket.new('127.0.0.1', @port) end after :each do @@ -74,7 +75,7 @@ describe "BasicSocket#send" do Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil - sockaddr = Socket.pack_sockaddr_in(SocketSpecs.port, "127.0.0.1") + sockaddr = Socket.pack_sockaddr_in(@port, "127.0.0.1") @socket.send('hello', 0, sockaddr).should == 5 @socket.shutdown # indicate, that we are done sending |