summaryrefslogtreecommitdiff
path: root/spec/ruby/library/socket/socket
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/library/socket/socket')
-rw-r--r--spec/ruby/library/socket/socket/accept_loop_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/accept_nonblock_spec.rb10
-rw-r--r--spec/ruby/library/socket/socket/accept_spec.rb7
-rw-r--r--spec/ruby/library/socket/socket/bind_spec.rb22
-rw-r--r--spec/ruby/library/socket/socket/connect_nonblock_spec.rb10
-rw-r--r--spec/ruby/library/socket/socket/connect_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/gethostbyaddr_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/getnameinfo_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/getservbyname_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/getservbyport_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/initialize_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/listen_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/recvfrom_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/sysaccept_spec.rb6
-rw-r--r--spec/ruby/library/socket/socket/tcp_server_loop_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/tcp_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/udp_server_loop_spec.rb2
-rw-r--r--spec/ruby/library/socket/socket/unix_server_loop_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb4
-rw-r--r--spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb4
22 files changed, 54 insertions, 57 deletions
diff --git a/spec/ruby/library/socket/socket/accept_loop_spec.rb b/spec/ruby/library/socket/socket/accept_loop_spec.rb
index ee11569da3..78e8c3fa4a 100644
--- a/spec/ruby/library/socket/socket/accept_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_loop_spec.rb
@@ -20,7 +20,7 @@ describe 'Socket.accept_loop' do
# https://ci.appveyor.com/project/ruby/ruby/builds/20817932/job/dor2ipny7ru4erpa
platform_is_not :windows do
it 'blocks the caller' do
- lambda { Socket.accept_loop([@server]) }.should block_caller
+ -> { Socket.accept_loop([@server]) }.should block_caller
end
end
end
@@ -53,7 +53,7 @@ describe 'Socket.accept_loop' do
describe 'using separate Socket arguments' do
describe 'without any available connections' do
it 'blocks the caller' do
- lambda { Socket.accept_loop(@server) }.should block_caller
+ -> { Socket.accept_loop(@server) }.should block_caller
end
end
diff --git a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
index cde9e6a4b6..3221f0b128 100644
--- a/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_nonblock_spec.rb
@@ -15,7 +15,7 @@ describe "Socket#accept_nonblock" do
end
it "raises IO::WaitReadable if the connection is not accepted yet" do
- lambda {
+ -> {
@socket.accept_nonblock
}.should raise_error(IO::WaitReadable) { |e|
platform_is_not :windows do
@@ -45,7 +45,7 @@ describe 'Socket#accept_nonblock' do
describe 'using an unbound socket' do
it 'raises Errno::EINVAL' do
- lambda { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
+ -> { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
end
end
@@ -55,7 +55,7 @@ describe 'Socket#accept_nonblock' do
end
it 'raises Errno::EINVAL' do
- lambda { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
+ -> { @server.accept_nonblock }.should raise_error(Errno::EINVAL)
end
end
@@ -63,7 +63,7 @@ describe 'Socket#accept_nonblock' do
it 'raises IOError' do
@server.close
- lambda { @server.accept_nonblock }.should raise_error(IOError)
+ -> { @server.accept_nonblock }.should raise_error(IOError)
end
end
@@ -75,7 +75,7 @@ describe 'Socket#accept_nonblock' do
describe 'without a connected client' do
it 'raises IO::WaitReadable' do
- lambda { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+ -> { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
end
end
diff --git a/spec/ruby/library/socket/socket/accept_spec.rb b/spec/ruby/library/socket/socket/accept_spec.rb
index a0778caa23..417f996c55 100644
--- a/spec/ruby/library/socket/socket/accept_spec.rb
+++ b/spec/ruby/library/socket/socket/accept_spec.rb
@@ -15,7 +15,7 @@ describe 'Socket#accept' do
platform_is :linux do # hangs on other platforms
describe 'using an unbound socket' do
it 'raises Errno::EINVAL' do
- lambda { @server.accept }.should raise_error(Errno::EINVAL)
+ -> { @server.accept }.should raise_error(Errno::EINVAL)
end
end
@@ -25,7 +25,7 @@ describe 'Socket#accept' do
end
it 'raises Errno::EINVAL' do
- lambda { @server.accept }.should raise_error(Errno::EINVAL)
+ -> { @server.accept }.should raise_error(Errno::EINVAL)
end
end
end
@@ -34,7 +34,7 @@ describe 'Socket#accept' do
it 'raises IOError' do
@server.close
- lambda { @server.accept }.should raise_error(IOError)
+ -> { @server.accept }.should raise_error(IOError)
end
end
@@ -56,7 +56,6 @@ describe 'Socket#accept' do
client.connect(@server_addr)
- thread.join(5)
value = thread.value
begin
value.should be_an_instance_of(Array)
diff --git a/spec/ruby/library/socket/socket/bind_spec.rb b/spec/ruby/library/socket/socket/bind_spec.rb
index 3a7df6ed71..0349df84a6 100644
--- a/spec/ruby/library/socket/socket/bind_spec.rb
+++ b/spec/ruby/library/socket/socket/bind_spec.rb
@@ -13,7 +13,7 @@ describe "Socket#bind on SOCK_DGRAM socket" do
end
it "binds to a port" do
- lambda { @sock.bind(@sockaddr) }.should_not raise_error
+ -> { @sock.bind(@sockaddr) }.should_not raise_error
end
it "returns 0 if successful" do
@@ -23,19 +23,19 @@ describe "Socket#bind on SOCK_DGRAM socket" do
it "raises Errno::EINVAL when already bound" do
@sock.bind(@sockaddr)
- lambda { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+ -> { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
end
it "raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine" do
sockaddr1 = Socket.pack_sockaddr_in(0, "4.3.2.1")
- lambda { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+ -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
end
platform_is_not :windows, :cygwin do
as_user do
it "raises Errno::EACCES when the current user does not have permission to bind" do
sockaddr1 = Socket.pack_sockaddr_in(1, "127.0.0.1")
- lambda { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+ -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
end
end
end
@@ -54,7 +54,7 @@ describe "Socket#bind on SOCK_STREAM socket" do
end
it "binds to a port" do
- lambda { @sock.bind(@sockaddr) }.should_not raise_error
+ -> { @sock.bind(@sockaddr) }.should_not raise_error
end
it "returns 0 if successful" do
@@ -64,19 +64,19 @@ describe "Socket#bind on SOCK_STREAM socket" do
it "raises Errno::EINVAL when already bound" do
@sock.bind(@sockaddr)
- lambda { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+ -> { @sock.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
end
it "raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine" do
sockaddr1 = Socket.pack_sockaddr_in(0, "4.3.2.1")
- lambda { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+ -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
end
platform_is_not :windows, :cygwin do
as_user do
it "raises Errno::EACCES when the current user does not have permission to bind" do
sockaddr1 = Socket.pack_sockaddr_in(1, "127.0.0.1")
- lambda { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+ -> { @sock.bind(sockaddr1) }.should raise_error(Errno::EACCES)
end
end
end
@@ -101,14 +101,14 @@ describe 'Socket#bind' do
it 'raises Errno::EINVAL when binding to an already bound port' do
@socket.bind(@sockaddr)
- lambda { @socket.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
+ -> { @socket.bind(@sockaddr) }.should raise_error(Errno::EINVAL)
end
it 'raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available' do
ip = family == Socket::AF_INET ? '4.3.2.1' : '::2'
sockaddr1 = Socket.sockaddr_in(0, ip)
- lambda { @socket.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
+ -> { @socket.bind(sockaddr1) }.should raise_error(Errno::EADDRNOTAVAIL)
end
platform_is_not :windows do
@@ -116,7 +116,7 @@ describe 'Socket#bind' do
it 'raises Errno::EACCES when the user is not allowed to bind to the port' do
sockaddr1 = Socket.pack_sockaddr_in(1, ip_address)
- lambda { @socket.bind(sockaddr1) }.should raise_error(Errno::EACCES)
+ -> { @socket.bind(sockaddr1) }.should raise_error(Errno::EACCES)
end
end
end
diff --git a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
index b5f416d96f..3cf667fc4a 100644
--- a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
@@ -53,13 +53,13 @@ describe "Socket#connect_nonblock" do
platform_is_not :freebsd, :solaris, :aix do
it "raises Errno::EINPROGRESS when the connect would block" do
- lambda do
+ -> do
@socket.connect_nonblock(@addr)
end.should raise_error(Errno::EINPROGRESS)
end
it "raises Errno::EINPROGRESS with IO::WaitWritable mixed in when the connect would block" do
- lambda do
+ -> do
@socket.connect_nonblock(@addr)
end.should raise_error(IO::WaitWritable)
end
@@ -95,7 +95,7 @@ describe 'Socket#connect_nonblock' do
end
it 'raises TypeError when passed an Integer' do
- lambda { @client.connect_nonblock(666) }.should raise_error(TypeError)
+ -> { @client.connect_nonblock(666) }.should raise_error(TypeError)
end
end
@@ -116,7 +116,7 @@ describe 'Socket#connect_nonblock' do
@server.listen(1)
@client.connect(@server.connect_address).should == 0
- lambda {
+ -> {
@client.connect_nonblock(@server.connect_address)
# A second call needed if non-blocking sockets become default
@@ -139,7 +139,7 @@ describe 'Socket#connect_nonblock' do
it 'raises IO:EINPROGRESSWaitWritable when the connection would block' do
@server.bind(@sockaddr)
- lambda {
+ -> {
@client.connect_nonblock(@server.connect_address)
}.should raise_error(IO::EINPROGRESSWaitWritable)
end
diff --git a/spec/ruby/library/socket/socket/connect_spec.rb b/spec/ruby/library/socket/socket/connect_spec.rb
index df5cc5bf34..8653fba552 100644
--- a/spec/ruby/library/socket/socket/connect_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_spec.rb
@@ -32,7 +32,7 @@ describe 'Socket#connect' do
@client.connect(@server.getsockname).should == 0
- lambda {
+ -> {
@client.connect(@server.getsockname)
# A second call needed if non-blocking sockets become default
diff --git a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
index 639a318132..5d97341103 100644
--- a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
@@ -57,7 +57,7 @@ describe 'Socket.gethostbyaddr' do
end
it 'raises SocketError when the address is not supported by the family' do
- lambda { Socket.gethostbyaddr(@addr, :INET6) }.should raise_error(SocketError)
+ -> { Socket.gethostbyaddr(@addr, :INET6) }.should raise_error(SocketError)
end
end
end
@@ -115,7 +115,7 @@ describe 'Socket.gethostbyaddr' do
platform_is_not :windows do
it 'raises SocketError when the address is not supported by the family' do
- lambda { Socket.gethostbyaddr(@addr, :INET) }.should raise_error(SocketError)
+ -> { Socket.gethostbyaddr(@addr, :INET) }.should raise_error(SocketError)
end
end
end
diff --git a/spec/ruby/library/socket/socket/getnameinfo_spec.rb b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
index fbbbcb53c5..b406348aa8 100644
--- a/spec/ruby/library/socket/socket/getnameinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
@@ -69,7 +69,7 @@ describe 'Socket.getnameinfo' do
end
it 'raises SocketError or TypeError when using an invalid String' do
- lambda { Socket.getnameinfo('cats') }.should raise_error(Exception) { |e|
+ -> { Socket.getnameinfo('cats') }.should raise_error(Exception) { |e|
[SocketError, TypeError].should include(e.class)
}
end
@@ -102,7 +102,7 @@ describe 'Socket.getnameinfo' do
end
it 'raises ArgumentError when using an invalid Array' do
- lambda { Socket.getnameinfo([family_name]) }.should raise_error(ArgumentError)
+ -> { Socket.getnameinfo([family_name]) }.should raise_error(ArgumentError)
end
platform_is_not :windows do
diff --git a/spec/ruby/library/socket/socket/getservbyname_spec.rb b/spec/ruby/library/socket/socket/getservbyname_spec.rb
index 9479b26228..d361e619f2 100644
--- a/spec/ruby/library/socket/socket/getservbyname_spec.rb
+++ b/spec/ruby/library/socket/socket/getservbyname_spec.rb
@@ -27,6 +27,6 @@ describe "Socket#getservbyname" do
end
it "raises a SocketError when the service or port is invalid" do
- lambda { Socket.getservbyname('invalid') }.should raise_error(SocketError)
+ -> { Socket.getservbyname('invalid') }.should raise_error(SocketError)
end
end
diff --git a/spec/ruby/library/socket/socket/getservbyport_spec.rb b/spec/ruby/library/socket/socket/getservbyport_spec.rb
index 9be2ac527e..563c592b54 100644
--- a/spec/ruby/library/socket/socket/getservbyport_spec.rb
+++ b/spec/ruby/library/socket/socket/getservbyport_spec.rb
@@ -18,6 +18,6 @@ describe 'Socket.getservbyport' do
end
it 'raises SocketError for an unknown port number' do
- lambda { Socket.getservbyport(0) }.should raise_error(SocketError)
+ -> { Socket.getservbyport(0) }.should raise_error(SocketError)
end
end
diff --git a/spec/ruby/library/socket/socket/initialize_spec.rb b/spec/ruby/library/socket/socket/initialize_spec.rb
index 2343c6e289..f8337bcaa5 100644
--- a/spec/ruby/library/socket/socket/initialize_spec.rb
+++ b/spec/ruby/library/socket/socket/initialize_spec.rb
@@ -53,7 +53,7 @@ describe 'Socket#initialize' do
family.stub!(:to_str).and_return(Socket::AF_INET)
type.stub!(:to_str).and_return(Socket::SOCK_STREAM)
- lambda { Socket.new(family, type) }.should raise_error(TypeError)
+ -> { Socket.new(family, type) }.should raise_error(TypeError)
end
end
@@ -65,7 +65,7 @@ describe 'Socket#initialize' do
end
it 'raises TypeError when using a Symbol' do
- lambda { Socket.new(:INET, :STREAM, :TCP) }.should raise_error(TypeError)
+ -> { Socket.new(:INET, :STREAM, :TCP) }.should raise_error(TypeError)
end
end
diff --git a/spec/ruby/library/socket/socket/listen_spec.rb b/spec/ruby/library/socket/socket/listen_spec.rb
index d0f9c70c4e..5de70d6db0 100644
--- a/spec/ruby/library/socket/socket/listen_spec.rb
+++ b/spec/ruby/library/socket/socket/listen_spec.rb
@@ -35,7 +35,7 @@ describe 'Socket#listen' do
end
it 'raises Errno::EOPNOTSUPP' do
- lambda { @server.listen(1) }.should raise_error(Errno::EOPNOTSUPP)
+ -> { @server.listen(1) }.should raise_error(Errno::EOPNOTSUPP)
end
end
@@ -57,7 +57,7 @@ describe 'Socket#listen' do
end
it "raises when the given argument can't be coerced to an Integer" do
- lambda { @server.listen('cats') }.should raise_error(TypeError)
+ -> { @server.listen('cats') }.should raise_error(TypeError)
end
end
end
diff --git a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
index 5f717d4b54..94f58ac49f 100644
--- a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
@@ -16,7 +16,7 @@ describe 'Socket#recvfrom_nonblock' do
platform_is_not :windows do
describe 'using an unbound socket' do
it 'raises IO::WaitReadable' do
- lambda { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+ -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
end
end
end
@@ -29,7 +29,7 @@ describe 'Socket#recvfrom_nonblock' do
describe 'without any data available' do
it 'raises IO::WaitReadable' do
- lambda { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
+ -> { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
end
it 'returns :wait_readable with exception: false' do
diff --git a/spec/ruby/library/socket/socket/recvfrom_spec.rb b/spec/ruby/library/socket/socket/recvfrom_spec.rb
index 7f0714511c..faf161e4a5 100644
--- a/spec/ruby/library/socket/socket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_spec.rb
@@ -15,7 +15,7 @@ describe 'Socket#recvfrom' do
describe 'using an unbound socket' do
it 'blocks the caller' do
- lambda { @server.recvfrom(1) }.should block_caller
+ -> { @server.recvfrom(1) }.should block_caller
end
end
@@ -27,7 +27,7 @@ describe 'Socket#recvfrom' do
describe 'without any data available' do
it 'blocks the caller' do
- lambda { @server.recvfrom(1) }.should block_caller
+ -> { @server.recvfrom(1) }.should block_caller
end
end
diff --git a/spec/ruby/library/socket/socket/sysaccept_spec.rb b/spec/ruby/library/socket/socket/sysaccept_spec.rb
index f039096707..92ac21124e 100644
--- a/spec/ruby/library/socket/socket/sysaccept_spec.rb
+++ b/spec/ruby/library/socket/socket/sysaccept_spec.rb
@@ -15,7 +15,7 @@ describe 'Socket#sysaccept' do
platform_is :linux do # hangs on other platforms
describe 'using an unbound socket' do
it 'raises Errno::EINVAL' do
- lambda { @server.sysaccept }.should raise_error(Errno::EINVAL)
+ -> { @server.sysaccept }.should raise_error(Errno::EINVAL)
end
end
@@ -25,7 +25,7 @@ describe 'Socket#sysaccept' do
end
it 'raises Errno::EINVAL' do
- lambda { @server.sysaccept }.should raise_error(Errno::EINVAL)
+ -> { @server.sysaccept }.should raise_error(Errno::EINVAL)
end
end
end
@@ -59,8 +59,6 @@ describe 'Socket#sysaccept' do
@client.connect(@server_addr)
- thread.join(5)
-
thread.value.should be_an_instance_of(Array)
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 05ecad67d1..a46c6df5c6 100644
--- a/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/tcp_server_loop_spec.rb
@@ -4,7 +4,7 @@ require_relative '../fixtures/classes'
describe 'Socket.tcp_server_loop' do
describe 'when no connections are available' do
it 'blocks the caller' do
- lambda { Socket.tcp_server_loop('127.0.0.1', 0) }.should block_caller
+ -> { Socket.tcp_server_loop('127.0.0.1', 0) }.should block_caller
end
end
@@ -45,7 +45,7 @@ describe 'Socket.tcp_server_loop' do
# 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)
+ thread.join
@sock.should be_an_instance_of(Socket)
addr.should be_an_instance_of(Addrinfo)
diff --git a/spec/ruby/library/socket/socket/tcp_spec.rb b/spec/ruby/library/socket/socket/tcp_spec.rb
index 29f166ffc5..d36e3e6adb 100644
--- a/spec/ruby/library/socket/socket/tcp_spec.rb
+++ b/spec/ruby/library/socket/socket/tcp_spec.rb
@@ -49,7 +49,7 @@ describe 'Socket.tcp' do
end
it 'raises ArgumentError when 6 arguments are provided' do
- lambda {
+ -> {
Socket.tcp(@host, @port, @host, 0, {:connect_timeout => 1}, 10)
}.should raise_error(ArgumentError)
end
diff --git a/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb b/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
index 1cb82d72be..cb8c5c5587 100644
--- a/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_loop_on_spec.rb
@@ -13,7 +13,7 @@ describe 'Socket.udp_server_loop_on' do
describe 'when no connections are available' do
it 'blocks the caller' do
- lambda { Socket.udp_server_loop_on([@server]) }.should block_caller
+ -> { Socket.udp_server_loop_on([@server]) }.should block_caller
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 168c17545f..66563bc742 100644
--- a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
@@ -4,7 +4,7 @@ require_relative '../fixtures/classes'
describe 'Socket.udp_server_loop' do
describe 'when no connections are available' do
it 'blocks the caller' do
- lambda { Socket.udp_server_loop('127.0.0.1', 0) }.should block_caller
+ -> { Socket.udp_server_loop('127.0.0.1', 0) }.should block_caller
end
end
diff --git a/spec/ruby/library/socket/socket/unix_server_loop_spec.rb b/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
index a2d2ad9fdb..0f34d4a50b 100644
--- a/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/unix_server_loop_spec.rb
@@ -13,7 +13,7 @@ with_feature :unix_socket do
describe 'when no connections are available' do
it 'blocks the caller' do
- lambda { Socket.unix_server_loop(@path) }.should block_caller
+ -> { Socket.unix_server_loop(@path) }.should block_caller
end
end
@@ -48,7 +48,7 @@ with_feature :unix_socket do
end
end
- thread.join(2)
+ thread.join
@sock.should be_an_instance_of(Socket)
addr.should be_an_instance_of(Addrinfo)
diff --git a/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb b/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
index 579ae307df..79ec68cd18 100644
--- a/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
+++ b/spec/ruby/library/socket/socket/unpack_sockaddr_in_spec.rb
@@ -35,12 +35,12 @@ describe "Socket.unpack_sockaddr_in" do
with_feature :unix_socket do
it "raises an ArgumentError when the sin_family is not AF_INET" do
sockaddr = Socket.sockaddr_un '/tmp/x'
- lambda { Socket.unpack_sockaddr_in sockaddr }.should raise_error(ArgumentError)
+ -> { Socket.unpack_sockaddr_in sockaddr }.should raise_error(ArgumentError)
end
it "raises an ArgumentError when passed addrinfo is not AF_INET/AF_INET6" do
addrinfo = Addrinfo.unix('/tmp/sock')
- lambda { Socket.unpack_sockaddr_in(addrinfo) }.should raise_error(ArgumentError)
+ -> { Socket.unpack_sockaddr_in(addrinfo) }.should raise_error(ArgumentError)
end
end
end
diff --git a/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb b/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
index 39e33c90e9..bd95f1db08 100644
--- a/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
+++ b/spec/ruby/library/socket/socket/unpack_sockaddr_un_spec.rb
@@ -15,12 +15,12 @@ with_feature :unix_socket do
it 'raises an ArgumentError when the sin_family is not AF_UNIX' do
sockaddr = Socket.sockaddr_in(0, '127.0.0.1')
- lambda { Socket.unpack_sockaddr_un(sockaddr) }.should raise_error(ArgumentError)
+ -> { Socket.unpack_sockaddr_un(sockaddr) }.should raise_error(ArgumentError)
end
it 'raises an ArgumentError when passed addrinfo is not AF_UNIX' do
addrinfo = Addrinfo.tcp('127.0.0.1', 0)
- lambda { Socket.unpack_sockaddr_un(addrinfo) }.should raise_error(ArgumentError)
+ -> { Socket.unpack_sockaddr_un(addrinfo) }.should raise_error(ArgumentError)
end
end
end