Update to ruby/spec@2795010

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

8 files changed, 76 insertions, 40 deletions

diff --git a/spec/rubyspec/library/socket/basicsocket/recv_spec.rb b/spec/rubyspec/library/socket/basicsocket/recv_spec.rb
index 9f3227dc65..5ac274f6d8 100644
--- a/spec/rubyspec/library/socket/basicsocket/recv_spec.rb
+++ b/spec/rubyspec/library/socket/basicsocket/recv_spec.rb
@@ -9,8 +9,7 @@ describe "BasicSocket#recv" do
   end
 
   after :each do
-    @server.closed?.should be_false
-    @server.close
+    @server.close unless @server.closed?
     ScratchPad.clear
   end
 
@@ -83,8 +82,11 @@ describe "BasicSocket#recv" do
 
       client = @server.accept
       buf = "foo"
-      client.recv(4, 0, buf)
-      client.close
+      begin
+        client.recv(4, 0, buf)
+      ensure
+        client.close
+      end
       buf.should == "data"
 
       socket.close
diff --git a/spec/rubyspec/library/socket/fixtures/classes.rb b/spec/rubyspec/library/socket/fixtures/classes.rb
index b772df5a39..6828f9fad5 100644
--- a/spec/rubyspec/library/socket/fixtures/classes.rb
+++ b/spec/rubyspec/library/socket/fixtures/classes.rb
@@ -72,26 +72,20 @@ module SocketSpecs
 
   # TCPServer echo server accepting one connection
   class SpecTCPServer
-    attr_accessor :hostname, :port, :logger
+    attr_reader :hostname, :port
 
-    def initialize(host=nil, port=nil, logger=nil)
-      @hostname = host || SocketSpecs.hostname
-      @port = port || SocketSpecs.port
-      @logger = logger
+    def initialize
+      @hostname = SocketSpecs.hostname
+      @server = TCPServer.new @hostname, 0
+      @port = @server.addr[1]
 
-      start
-    end
-
-    def start
       log "SpecTCPServer starting on #{@hostname}:#{@port}"
-      @server = TCPServer.new @hostname, @port
 
       @thread = Thread.new do
         socket = @server.accept
         log "SpecTCPServer accepted connection: #{socket}"
         service socket
       end
-      self
     end
 
     def service(socket)
diff --git a/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb b/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
index 565a1795e9..ccf7b1cc51 100644
--- a/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
+++ b/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
@@ -17,8 +17,11 @@ describe "Socket::IPSocket#recvfrom" do
     data = nil
     t = Thread.new do
       client = @server.accept
-      data = client.recvfrom(6)
-      client.close
+      begin
+        data = client.recvfrom(6)
+      ensure
+        client.close
+      end
     end
 
     @client.send('hello', 0)
@@ -33,8 +36,11 @@ describe "Socket::IPSocket#recvfrom" do
     data = nil
     t = Thread.new do
       client = @server.accept
-      data = client.recvfrom(3)
-      client.close
+      begin
+        data = client.recvfrom(3)
+      ensure
+        client.close
+      end
     end
 
     @client.send('hello', 0)
diff --git a/spec/rubyspec/library/socket/tcpsocket/recv_nonblock_spec.rb b/spec/rubyspec/library/socket/tcpsocket/recv_nonblock_spec.rb
index 1d89aa866c..237ff781a3 100644
--- a/spec/rubyspec/library/socket/tcpsocket/recv_nonblock_spec.rb
+++ b/spec/rubyspec/library/socket/tcpsocket/recv_nonblock_spec.rb
@@ -16,7 +16,7 @@ describe "TCPSocket#recv_nonblock" do
   end
 
   it "returns a String read from the socket" do
-    @socket = TCPSocket.new @hostname, SocketSpecs.port
+    @socket = TCPSocket.new @hostname, @server.port
     @socket.write "TCPSocket#recv_nonblock"
 
     # Wait for the server to echo. This spec is testing the return
@@ -29,7 +29,7 @@ describe "TCPSocket#recv_nonblock" do
 
   ruby_version_is '2.3' do
     it 'returns :wait_readable in exceptionless mode' do
-      @socket = TCPSocket.new @hostname, SocketSpecs.port
+      @socket = TCPSocket.new @hostname, @server.port
       @socket.recv_nonblock(50, exception: false).should == :wait_readable
     end
   end
diff --git a/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb b/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb
index 8eacc1275d..8a0cb443b5 100644
--- a/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb
+++ b/spec/rubyspec/library/socket/tcpsocket/setsockopt_spec.rb
@@ -5,10 +5,7 @@ describe "TCPSocket#setsockopt" do
   before :each do
     @server = SocketSpecs::SpecTCPServer.new
     @hostname = @server.hostname
-  end
-
-  before :each do
-    @sock = TCPSocket.new @hostname, SocketSpecs.port
+    @sock = TCPSocket.new @hostname, @server.port
   end
 
   after :each do
diff --git a/spec/rubyspec/library/socket/tcpsocket/shared/new.rb b/spec/rubyspec/library/socket/tcpsocket/shared/new.rb
index d172456923..14b6e4373b 100644
--- a/spec/rubyspec/library/socket/tcpsocket/shared/new.rb
+++ b/spec/rubyspec/library/socket/tcpsocket/shared/new.rb
@@ -29,28 +29,28 @@ describe :tcpsocket_new, shared: true do
     end
 
     it "silently ignores 'nil' as the third parameter" do
-      @socket = TCPSocket.send(@method, @hostname, SocketSpecs.port, nil)
+      @socket = TCPSocket.send(@method, @hostname, @server.port, nil)
       @socket.should be_an_instance_of(TCPSocket)
     end
 
     it "connects to a listening server with host and port" do
-      @socket = TCPSocket.send(@method, @hostname, SocketSpecs.port)
+      @socket = TCPSocket.send(@method, @hostname, @server.port)
       @socket.should be_an_instance_of(TCPSocket)
     end
 
     it "connects to a server when passed local_host argument" do
-      @socket = TCPSocket.send(@method, @hostname, SocketSpecs.port, @hostname)
+      @socket = TCPSocket.send(@method, @hostname, @server.port, @hostname)
       @socket.should be_an_instance_of(TCPSocket)
     end
 
     it "connects to a server when passed local_host and local_port arguments" do
-      @socket = TCPSocket.send(@method, @hostname, SocketSpecs.port,
+      @socket = TCPSocket.send(@method, @hostname, @server.port,
                                @hostname, SocketSpecs.local_port)
       @socket.should be_an_instance_of(TCPSocket)
     end
 
     it "has an address once it has connected to a listening server" do
-      @socket = TCPSocket.send(@method, @hostname, SocketSpecs.port)
+      @socket = TCPSocket.send(@method, @hostname, @server.port)
       @socket.should be_an_instance_of(TCPSocket)
 
       # TODO: Figure out how to abstract this. You can get AF_INET
diff --git a/spec/rubyspec/library/socket/udpsocket/send_spec.rb b/spec/rubyspec/library/socket/udpsocket/send_spec.rb
index ad0e6a7f2f..feff020dd7 100644
--- a/spec/rubyspec/library/socket/udpsocket/send_spec.rb
+++ b/spec/rubyspec/library/socket/udpsocket/send_spec.rb
@@ -6,22 +6,25 @@ describe "UDPSocket.send" do
     @ready = false
     @server_thread = Thread.new do
       @server = UDPSocket.open
-      @server.bind(nil, SocketSpecs.port)
-      @ready = true
       begin
-        @msg = @server.recvfrom_nonblock(64)
-      rescue IO::WaitReadable
-        IO.select([@server])
-        retry
+        @server.bind(nil, SocketSpecs.port)
+        @ready = true
+        begin
+          @msg = @server.recvfrom_nonblock(64)
+        rescue IO::WaitReadable
+          IO.select([@server])
+          retry
+        end
+      ensure
+        @server.close if !@server.closed?
       end
-      @server.close
     end
     Thread.pass while @server_thread.status and !@ready
   end
 
   it "sends data in ad hoc mode" do
     @socket = UDPSocket.open
-    @socket.send("ad hoc", 0, SocketSpecs.hostname,SocketSpecs.port)
+    @socket.send("ad hoc", 0, SocketSpecs.hostname, SocketSpecs.port)
     @socket.close
     @server_thread.join
 
@@ -33,7 +36,7 @@ describe "UDPSocket.send" do
 
   it "sends data in ad hoc mode (with port given as a String)" do
     @socket = UDPSocket.open
-    @socket.send("ad hoc", 0, SocketSpecs.hostname,SocketSpecs.str_port)
+    @socket.send("ad hoc", 0, SocketSpecs.hostname, SocketSpecs.str_port)
     @socket.close
     @server_thread.join
 
@@ -45,7 +48,7 @@ describe "UDPSocket.send" do
 
   it "sends data in connection mode" do
     @socket = UDPSocket.open
-    @socket.connect(SocketSpecs.hostname,SocketSpecs.port)
+    @socket.connect(SocketSpecs.hostname, SocketSpecs.port)
     @socket.send("connection-based", 0)
     @socket.close
     @server_thread.join
@@ -55,4 +58,17 @@ describe "UDPSocket.send" do
     @msg[1][1].should be_kind_of(Fixnum)
     @msg[1][3].should == "127.0.0.1"
   end
+
+  it "raises EMSGSIZE if data is too too big" do
+    @socket = UDPSocket.open
+    begin
+      lambda do
+        @socket.send('1' * 100_000, 0, SocketSpecs.hostname, SocketSpecs.str_port)
+      end.should raise_error(Errno::EMSGSIZE)
+    ensure
+      @socket.send("ad hoc", 0, SocketSpecs.hostname, SocketSpecs.port)
+      @socket.close
+      @server_thread.join
+    end
+  end
 end
diff --git a/spec/rubyspec/library/socket/udpsocket/write_spec.rb b/spec/rubyspec/library/socket/udpsocket/write_spec.rb
new file mode 100644
index 0000000000..97985ff7ae
--- /dev/null
+++ b/spec/rubyspec/library/socket/udpsocket/write_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+
+describe "UDPSocket#write" do
+  it "raises EMSGSIZE if msg is too long" do
+    begin
+      host, port = SocketSpecs.hostname, SocketSpecs.port
+      s1 = UDPSocket.new
+      s1.bind(host, port)
+      s2 = UDPSocket.new
+      s2.connect(host, port)
+
+      lambda do
+        s2.write('1' * 100_000)
+      end.should raise_error(Errno::EMSGSIZE)
+    ensure
+      s1.close if s1 && !s1.closed?
+      s2.close if s2 && !s2.closed?
+    end
+  end
+end