Update to ruby/spec@83e26c9

10 files changed, 129 insertions, 332 deletions

diff --git a/spec/ruby/library/socket/addrinfo/initialize_spec.rb b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
index 1f16531aaa..c556bd758b 100644
--- a/spec/ruby/library/socket/addrinfo/initialize_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
@@ -53,11 +53,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the INET6 pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the INET6 afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -83,11 +83,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the INET6 pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the INET6 afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -113,11 +113,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 25
       end
 
-      it "returns the INET6 pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET6
       end
 
-      it "returns the INET6 afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
 
@@ -147,11 +147,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the INET pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the INET afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -217,11 +217,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the INET pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the INET afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -247,11 +247,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the INET pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the INET afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -311,11 +311,11 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the INET pfamily" do
+      it "returns the specified family" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
-      it "returns the INET afamily" do
+      it "returns the specified family" do
         @addrinfo.afamily.should == Socket::AF_INET
       end
 
@@ -514,13 +514,13 @@ describe "Addrinfo#initialize" do
       @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
     end
 
-    it 'returns an Addrinfo with :PF_INET family' do
+    it 'returns an Addrinfo with the specified family' do
       addr = Addrinfo.new(@sockaddr, :PF_INET)
 
       addr.pfamily.should == Socket::PF_INET
     end
 
-    it 'returns an Addrinfo with :INET family' do
+    it 'returns an Addrinfo with the specified family' do
       addr = Addrinfo.new(@sockaddr, :INET)
 
       addr.pfamily.should == Socket::PF_INET
@@ -544,13 +544,13 @@ describe "Addrinfo#initialize" do
       @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
     end
 
-    it 'returns an Addrinfo with "PF_INET" family' do
+    it 'returns an Addrinfo with the specified family' do
       addr = Addrinfo.new(@sockaddr, 'PF_INET')
 
       addr.pfamily.should == Socket::PF_INET
     end
 
-    it 'returns an Addrinfo with "INET" family' do
+    it 'returns an Addrinfo with the specified family' do
       addr = Addrinfo.new(@sockaddr, 'INET')
 
       addr.pfamily.should == Socket::PF_INET
diff --git a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
index f2a6682f12..f2383513f2 100644
--- a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
@@ -112,60 +112,30 @@ describe "Socket::BasicSocket#recv_nonblock" do
         @server.close unless @server.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        it "returns an empty String on a closed stream socket" do
-          ready = false
-
-          t = Thread.new do
-            client = @server.accept
-
-            Thread.pass while !ready
-            begin
-              client.recv_nonblock(10)
-            rescue IO::EAGAINWaitReadable
-              retry
-            end
-          ensure
-            client.close if client
-          end
-
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+      it "returns nil on a closed stream socket" do
+        ready = false
 
-          socket = TCPSocket.new('127.0.0.1', @port)
-          socket.close
-          ready = true
+        t = Thread.new do
+          client = @server.accept
 
-          t.value.should == ""
-        end
-      end
-
-      ruby_version_is "3.3" do
-        it "returns nil on a closed stream socket" do
-          ready = false
-
-          t = Thread.new do
-            client = @server.accept
-
-            Thread.pass while !ready
-            begin
-              client.recv_nonblock(10)
-            rescue IO::EAGAINWaitReadable
-              retry
-            end
-          ensure
-            client.close if client
+          Thread.pass while !ready
+          begin
+            client.recv_nonblock(10)
+          rescue IO::EAGAINWaitReadable
+            retry
           end
+        ensure
+          client.close if client
+        end
 
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+        Thread.pass while t.status and t.status != "sleep"
+        t.status.should_not be_nil
 
-          socket = TCPSocket.new('127.0.0.1', @port)
-          socket.close
-          ready = true
+        socket = TCPSocket.new('127.0.0.1', @port)
+        socket.close
+        ready = true
 
-          t.value.should be_nil
-        end
+        t.value.should be_nil
       end
     end
   end
diff --git a/spec/ruby/library/socket/basicsocket/recv_spec.rb b/spec/ruby/library/socket/basicsocket/recv_spec.rb
index a51920f52a..7581f1bc15 100644
--- a/spec/ruby/library/socket/basicsocket/recv_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_spec.rb
@@ -184,42 +184,21 @@ describe "BasicSocket#recv" do
         @server.close unless @server.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        it "returns an empty String on a closed stream socket" do
-          t = Thread.new do
-            client = @server.accept
-            client.recv(10)
-          ensure
-            client.close if client
-          end
-
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
-
-          socket = TCPSocket.new('127.0.0.1', @port)
-          socket.close
-
-          t.value.should == ""
+      it "returns nil on a closed stream socket" do
+        t = Thread.new do
+          client = @server.accept
+          client.recv(10)
+        ensure
+          client.close if client
         end
-      end
-
-      ruby_version_is "3.3" do
-        it "returns nil on a closed stream socket" do
-          t = Thread.new do
-            client = @server.accept
-            client.recv(10)
-          ensure
-            client.close if client
-          end
 
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+        Thread.pass while t.status and t.status != "sleep"
+        t.status.should_not be_nil
 
-          socket = TCPSocket.new('127.0.0.1', @port)
-          socket.close
+        socket = TCPSocket.new('127.0.0.1', @port)
+        socket.close
 
-          t.value.should be_nil
-        end
+        t.value.should be_nil
       end
     end
 
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
index b5fdd7c93b..d1cde4411b 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
@@ -235,64 +235,31 @@ describe 'BasicSocket#recvmsg_nonblock' do
         @server.close unless @server.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        platform_is_not :windows do # #recvmsg_nonblock() raises 'Errno::EINVAL: Invalid argument - recvmsg(2)'
-          it "returns an empty String as received data on a closed stream socket" do
-            ready = false
+      platform_is_not :windows do
+        it "returns nil on a closed stream socket" do
+          ready = false
 
-            t = Thread.new do
-              client = @server.accept
+          t = Thread.new do
+            client = @server.accept
 
-              Thread.pass while !ready
-              begin
-                client.recvmsg_nonblock(10)
-              rescue IO::EAGAINWaitReadable
-                retry
-              end
-            ensure
-              client.close if client
+            Thread.pass while !ready
+            begin
+              client.recvmsg_nonblock(10)
+            rescue IO::EAGAINWaitReadable
+              retry
             end
-
-            Thread.pass while t.status and t.status != "sleep"
-            t.status.should_not be_nil
-
-            socket = TCPSocket.new('127.0.0.1', @port)
-            socket.close
-            ready = true
-
-            t.value.should.is_a? Array
-            t.value[0].should == ""
+          ensure
+            client.close if client
           end
-        end
-      end
 
-      ruby_version_is "3.3" do
-        platform_is_not :windows do
-          it "returns nil on a closed stream socket" do
-            ready = false
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
 
-            t = Thread.new do
-              client = @server.accept
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+          ready = true
 
-              Thread.pass while !ready
-              begin
-                client.recvmsg_nonblock(10)
-              rescue IO::EAGAINWaitReadable
-                retry
-              end
-            ensure
-              client.close if client
-            end
-
-            Thread.pass while t.status and t.status != "sleep"
-            t.status.should_not be_nil
-
-            socket = TCPSocket.new('127.0.0.1', @port)
-            socket.close
-            ready = true
-
-            t.value.should be_nil
-          end
+          t.value.should be_nil
         end
       end
     end
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
index 04ba1d74c7..cfa0f4c61d 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
@@ -208,46 +208,22 @@ describe 'BasicSocket#recvmsg' do
         @server.close unless @server.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        platform_is_not :windows do
-          it "returns an empty String as received data on a closed stream socket" do
-            t = Thread.new do
-              client = @server.accept
-              client.recvmsg(10)
-            ensure
-              client.close if client
-            end
-
-            Thread.pass while t.status and t.status != "sleep"
-            t.status.should_not be_nil
-
-            socket = TCPSocket.new('127.0.0.1', @port)
-            socket.close
-
-            t.value.should.is_a? Array
-            t.value[0].should == ""
+      platform_is_not :windows do
+        it "returns nil on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            client.recvmsg(10)
+          ensure
+            client.close if client
           end
-        end
-      end
-
-      ruby_version_is "3.3" do
-        platform_is_not :windows do
-          it "returns nil on a closed stream socket" do
-            t = Thread.new do
-              client = @server.accept
-              client.recvmsg(10)
-            ensure
-              client.close if client
-            end
 
-            Thread.pass while t.status and t.status != "sleep"
-            t.status.should_not be_nil
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
 
-            socket = TCPSocket.new('127.0.0.1', @port)
-            socket.close
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
 
-            t.value.should be_nil
-          end
+          t.value.should be_nil
         end
       end
     end
diff --git a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
index b58903df23..5e6a145c9b 100644
--- a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
@@ -83,43 +83,21 @@ describe "Socket::IPSocket#recvfrom" do
         @client.close unless @client.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        it "returns an empty String as received data on a closed stream socket" do
-          t = Thread.new do
-            client = @server.accept
-            message = client.recvfrom(10)
-            message
-          ensure
-            client.close if client
-          end
-
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
-
-          @client.close
-
-          t.value.should.is_a? Array
-          t.value[0].should == ""
+      it "returns nil on a closed stream socket" do
+        t = Thread.new do
+          client = @server.accept
+          message = client.recvfrom(10)
+          message
+        ensure
+          client.close if client
         end
-      end
-
-      ruby_version_is "3.3" do
-        it "returns nil on a closed stream socket" do
-          t = Thread.new do
-            client = @server.accept
-            message = client.recvfrom(10)
-            message
-          ensure
-            client.close if client
-          end
 
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+        Thread.pass while t.status and t.status != "sleep"
+        t.status.should_not be_nil
 
-          @client.close
+        @client.close
 
-          t.value.should be_nil
-        end
+        t.value.should be_nil
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
index 6576af52ee..17ffeaccaf 100644
--- a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
@@ -107,22 +107,12 @@ describe "Socket.getaddrinfo" do
       res.each { |a| expected.should include(a) }
     end
 
-    ruby_version_is ""..."3.3" do
-      it "raises SocketError when fails to resolve address" do
-        -> {
-          Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX")
-        }.should raise_error(SocketError)
-      end
-    end
-
-    ruby_version_is "3.3" do
-      it "raises ResolutionError when fails to resolve address" do
-        -> {
-          Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX")
-        }.should raise_error(Socket::ResolutionError) { |e|
-          [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
-        }
-      end
+    it "raises ResolutionError when fails to resolve address" do
+      -> {
+        Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX")
+      }.should raise_error(Socket::ResolutionError) { |e|
+        [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
+      }
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/getnameinfo_spec.rb b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
index af4a10c9c2..48cc94bcd1 100644
--- a/spec/ruby/library/socket/socket/getnameinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
@@ -61,22 +61,12 @@ describe "Socket.getnameinfo" do
     name_info[1].should == 'discard'
   end
 
-  ruby_version_is ""..."3.3" do
-    it "raises SocketError when fails to resolve address" do
-      -> {
-        Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"])
-      }.should raise_error(SocketError)
-    end
-  end
-
-  ruby_version_is "3.3" do
-    it "raises ResolutionError when fails to resolve address" do
-      -> {
-        Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"])
-      }.should raise_error(Socket::ResolutionError) { |e|
-        [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
-      }
-    end
+  it "raises ResolutionError when fails to resolve address" do
+    -> {
+      Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"])
+    }.should raise_error(Socket::ResolutionError) { |e|
+      [Socket::EAI_FAMILY, Socket::EAI_FAIL].should.include?(e.error_code)
+    }
   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 01b42bcc52..38a9f5ff5b 100644
--- a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
@@ -158,61 +158,30 @@ describe 'Socket#recvfrom_nonblock' do
         @client.close unless @client.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        it "returns an empty String as received data on a closed stream socket" do
-          ready = false
-
-          t = Thread.new do
-            client, _ = @server.accept
-
-            Thread.pass while !ready
-            begin
-              client.recvfrom_nonblock(10)
-            rescue IO::EAGAINWaitReadable
-              retry
-            end
-          ensure
-            client.close if client
-          end
-
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+      it "returns nil on a closed stream socket" do
+        ready = false
 
-          @client.connect(@server_addr)
-          @client.close
-          ready = true
-
-          t.value.should.is_a? Array
-          t.value[0].should == ""
-        end
-      end
+        t = Thread.new do
+          client, _ = @server.accept
 
-      ruby_version_is "3.3" do
-        it "returns nil on a closed stream socket" do
-          ready = false
-
-          t = Thread.new do
-            client, _ = @server.accept
-
-            Thread.pass while !ready
-            begin
-              client.recvfrom_nonblock(10)
-            rescue IO::EAGAINWaitReadable
-              retry
-            end
-          ensure
-            client.close if client
+          Thread.pass while !ready
+          begin
+            client.recvfrom_nonblock(10)
+          rescue IO::EAGAINWaitReadable
+            retry
           end
+        ensure
+          client.close if client
+        end
 
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+        Thread.pass while t.status and t.status != "sleep"
+        t.status.should_not be_nil
 
-          @client.connect(@server_addr)
-          @client.close
-          ready = true
+        @client.connect(@server_addr)
+        @client.close
+        ready = true
 
-          t.value.should be_nil
-        end
+        t.value.should be_nil
       end
     end
   end
diff --git a/spec/ruby/library/socket/socket/recvfrom_spec.rb b/spec/ruby/library/socket/socket/recvfrom_spec.rb
index 6ba39ffcaf..cbbc162f6b 100644
--- a/spec/ruby/library/socket/socket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_spec.rb
@@ -111,43 +111,21 @@ describe 'Socket#recvfrom' do
         @client.close unless @client.closed?
       end
 
-      ruby_version_is ""..."3.3" do
-        it "returns an empty String as received data on a closed stream socket" do
-          t = Thread.new do
-            client, _ = @server.accept
-            client.recvfrom(10)
-          ensure
-            client.close if client
-          end
-
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
-
-          @client.connect(@server_addr)
-          @client.close
-
-          t.value.should.is_a? Array
-          t.value[0].should == ""
+      it "returns nil on a closed stream socket" do
+        t = Thread.new do
+          client, _ = @server.accept
+          client.recvfrom(10)
+        ensure
+          client.close if client
         end
-      end
-
-      ruby_version_is "3.3" do
-        it "returns nil on a closed stream socket" do
-          t = Thread.new do
-            client, _ = @server.accept
-            client.recvfrom(10)
-          ensure
-            client.close if client
-          end
 
-          Thread.pass while t.status and t.status != "sleep"
-          t.status.should_not be_nil
+        Thread.pass while t.status and t.status != "sleep"
+        t.status.should_not be_nil
 
-          @client.connect(@server_addr)
-          @client.close
+        @client.connect(@server_addr)
+        @client.close
 
-          t.value.should be_nil
-        end
+        t.value.should be_nil
       end
     end