Update to ruby/spec@ccf0d85

7 files changed, 341 insertions, 15 deletions

diff --git a/spec/ruby/library/net/http/http/fixtures/http_server.rb b/spec/ruby/library/net/http/http/fixtures/http_server.rb
index 63543b46a9..c1cedbfa76 100644
--- a/spec/ruby/library/net/http/http/fixtures/http_server.rb
+++ b/spec/ruby/library/net/http/http/fixtures/http_server.rb
@@ -11,29 +11,23 @@ module NetHTTPSpecs
   class SmallHTTPServer
     def initialize(bind_address)
       @server = TCPServer.new(bind_address, 0)
-      @running = Mutex.new
       @thread = Thread.new {
         Thread.current.abort_on_exception = true
         listen
       }
     end
 
+    def ip
+      @server.addr[3]
+    end
+
     def port
       @server.addr[1]
     end
 
     def listen
-      loop do
-        begin
-          client = @server.accept
-        rescue IOError => e
-          if @running.locked? # close
-            break
-          else
-            raise e
-          end
-        end
-
+      until @server.closed?
+        client = @server.accept
         handle_client(client)
       end
     end
@@ -43,6 +37,10 @@ module NetHTTPSpecs
         until client.closed?
           request = client.gets("\r\n\r\n")
           break unless request
+          if request == "CLOSE"
+            @server.close
+            break
+          end
           handle_request(client, request)
         end
       ensure
@@ -95,8 +93,9 @@ module NetHTTPSpecs
     end
 
     def close
-      @running.lock
-      @server.close
+      TCPSocket.open(ip, port) do |socket|
+        socket.write "CLOSE"
+      end
       @thread.join
     end
   end
diff --git a/spec/ruby/library/rbconfig/rbconfig_spec.rb b/spec/ruby/library/rbconfig/rbconfig_spec.rb
index e1fd84de91..b90cc90970 100644
--- a/spec/ruby/library/rbconfig/rbconfig_spec.rb
+++ b/spec/ruby/library/rbconfig/rbconfig_spec.rb
@@ -42,6 +42,17 @@ describe 'RbConfig::CONFIG' do
     RUBY
   end
 
+  platform_is_not :windows do
+    it "['LIBRUBY'] is the same as LIBRUBY_SO if and only if ENABLE_SHARED" do
+      case RbConfig::CONFIG['ENABLE_SHARED']
+      when 'yes'
+        RbConfig::CONFIG['LIBRUBY'].should == RbConfig::CONFIG['LIBRUBY_SO']
+      when 'no'
+        RbConfig::CONFIG['LIBRUBY'].should_not == RbConfig::CONFIG['LIBRUBY_SO']
+      end
+    end
+  end
+
   guard -> { RbConfig::TOPDIR } do
     it "libdir/LIBRUBY_SO is the path to libruby and it exists if and only if ENABLE_SHARED" do
       libdirname = RbConfig::CONFIG['LIBPATHENV'] == 'PATH' ? 'bindir' :
diff --git a/spec/ruby/library/socket/basicsocket/local_address_spec.rb b/spec/ruby/library/socket/basicsocket/local_address_spec.rb
new file mode 100644
index 0000000000..0bd60a44cd
--- /dev/null
+++ b/spec/ruby/library/socket/basicsocket/local_address_spec.rb
@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require_relative '../shared/address'
+
+describe 'BasicSocket#local_address' do
+  it_behaves_like :socket_local_remote_address, :local_address, -> socket {
+    a2 = BasicSocket.for_fd(socket.fileno)
+    a2.autoclose = false
+    a2.local_address
+  }
+end
diff --git a/spec/ruby/library/socket/basicsocket/remote_address_spec.rb b/spec/ruby/library/socket/basicsocket/remote_address_spec.rb
new file mode 100644
index 0000000000..439bf31592
--- /dev/null
+++ b/spec/ruby/library/socket/basicsocket/remote_address_spec.rb
@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require_relative '../shared/address'
+
+describe 'BasicSocket#remote_address' do
+  it_behaves_like :socket_local_remote_address, :remote_address, -> socket {
+    a2 = BasicSocket.for_fd(socket.fileno)
+    a2.autoclose = false
+    a2.remote_address
+  }
+end
diff --git a/spec/ruby/library/socket/shared/address.rb b/spec/ruby/library/socket/shared/address.rb
new file mode 100644
index 0000000000..f3be9cfb99
--- /dev/null
+++ b/spec/ruby/library/socket/shared/address.rb
@@ -0,0 +1,249 @@
+require_relative '../fixtures/classes'
+
+describe :socket_local_remote_address, shared: true do
+  describe 'using TCPSocket' do
+    before :each do
+      @s = TCPServer.new('127.0.0.1', 0)
+      @a = TCPSocket.new('127.0.0.1', @s.addr[1])
+      @b = @s.accept
+      @addr = @object.call(@a)
+    end
+
+    after :each do
+      [@b, @a, @s].each(&:close)
+    end
+
+    it 'uses AF_INET as the address family' do
+      @addr.afamily.should == Socket::AF_INET
+    end
+
+    it 'uses PF_INET as the protocol family' do
+      @addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'uses SOCK_STREAM as the socket type' do
+      @addr.socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'uses the correct IP address' do
+      @addr.ip_address.should == '127.0.0.1'
+    end
+
+    it 'uses the correct port' do
+      if @method == :local_address
+        @addr.ip_port.should != @s.addr[1]
+      else
+        @addr.ip_port.should == @s.addr[1]
+      end
+    end
+
+    it 'equals address of peer socket' do
+      if @method == :local_address
+        @addr.to_s.should == @b.remote_address.to_s
+      else
+        @addr.to_s.should == @b.local_address.to_s
+      end
+    end
+
+    it 'returns an Addrinfo' do
+      @addr.should be_an_instance_of(Addrinfo)
+    end
+
+    it 'uses 0 as the protocol' do
+      @addr.protocol.should == 0
+    end
+
+    it 'can be used to connect to the server' do
+      skip if @method == :local_address
+      b = @addr.connect
+      begin
+        b.remote_address.to_s.should == @addr.to_s
+      ensure
+        b.close
+      end
+    end
+  end
+
+  guard -> { SocketSpecs.ipv6_available? } do
+    describe 'using IPv6' do
+      before :each do
+        @s = TCPServer.new('::1', 0)
+        @a = TCPSocket.new('::1', @s.addr[1])
+        @b = @s.accept
+        @addr = @object.call(@a)
+      end
+
+      after :each do
+        [@b, @a, @s].each(&:close)
+      end
+
+      it 'uses AF_INET6 as the address family' do
+        @addr.afamily.should == Socket::AF_INET6
+      end
+
+      it 'uses PF_INET6 as the protocol family' do
+        @addr.pfamily.should == Socket::PF_INET6
+      end
+
+      it 'uses SOCK_STREAM as the socket type' do
+        @addr.socktype.should == Socket::SOCK_STREAM
+      end
+
+      it 'uses the correct IP address' do
+        @addr.ip_address.should == '::1'
+      end
+
+      it 'uses the correct port' do
+        if @method == :local_address
+          @addr.ip_port.should != @s.addr[1]
+        else
+          @addr.ip_port.should == @s.addr[1]
+        end
+      end
+
+      it 'equals address of peer socket' do
+        if @method == :local_address
+          @addr.to_s.should == @b.remote_address.to_s
+        else
+          @addr.to_s.should == @b.local_address.to_s
+        end
+      end
+
+      it 'returns an Addrinfo' do
+        @addr.should be_an_instance_of(Addrinfo)
+      end
+
+      it 'uses 0 as the protocol' do
+        @addr.protocol.should == 0
+      end
+
+      it 'can be used to connect to the server' do
+        skip if @method == :local_address
+        b = @addr.connect
+        begin
+          b.remote_address.to_s.should == @addr.to_s
+        ensure
+          b.close
+        end
+      end
+    end
+  end
+
+  with_feature :unix_socket do
+    describe 'using UNIXSocket' do
+      before :each do
+        @path = SocketSpecs.socket_path
+        @s = UNIXServer.new(@path)
+        @a = UNIXSocket.new(@path)
+        @b = @s.accept
+        @addr = @object.call(@a)
+      end
+
+      after :each do
+        [@b, @a, @s].each(&:close)
+        rm_r(@path)
+      end
+
+      it 'uses AF_UNIX as the address family' do
+        @addr.afamily.should == Socket::AF_UNIX
+      end
+
+      it 'uses PF_UNIX as the protocol family' do
+        @addr.pfamily.should == Socket::PF_UNIX
+      end
+
+      it 'uses SOCK_STREAM as the socket type' do
+        @addr.socktype.should == Socket::SOCK_STREAM
+      end
+
+      it 'uses the correct socket path' do
+        if @method == :local_address
+          @addr.unix_path.should == ""
+        else
+          @addr.unix_path.should == @path
+        end
+      end
+
+      it 'equals address of peer socket' do
+        if @method == :local_address
+          @addr.to_s.should == @b.remote_address.to_s
+        else
+          @addr.to_s.should == @b.local_address.to_s
+        end
+      end
+
+      it 'returns an Addrinfo' do
+        @addr.should be_an_instance_of(Addrinfo)
+      end
+
+      it 'uses 0 as the protocol' do
+        @addr.protocol.should == 0
+      end
+
+      it 'can be used to connect to the server' do
+        skip if @method == :local_address
+        b = @addr.connect
+        begin
+          b.remote_address.to_s.should == @addr.to_s
+        ensure
+          b.close
+        end
+      end
+    end
+  end
+
+  describe 'using UDPSocket' do
+    before :each do
+      @s = UDPSocket.new
+      @s.bind("127.0.0.1", 0)
+      @a = UDPSocket.new
+      @a.connect("127.0.0.1", @s.addr[1])
+      @addr = @object.call(@a)
+    end
+
+    after :each do
+      [@a, @s].each(&:close)
+    end
+
+    it 'uses the correct address family' do
+      @addr.afamily.should == Socket::AF_INET
+    end
+
+    it 'uses the correct protocol family' do
+      @addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'uses SOCK_DGRAM as the socket type' do
+      @addr.socktype.should == Socket::SOCK_DGRAM
+    end
+
+    it 'uses the correct IP address' do
+      @addr.ip_address.should == '127.0.0.1'
+    end
+
+    it 'uses the correct port' do
+      if @method == :local_address
+        @addr.ip_port.should != @s.addr[1]
+      else
+        @addr.ip_port.should == @s.addr[1]
+      end
+    end
+
+    it 'returns an Addrinfo' do
+      @addr.should be_an_instance_of(Addrinfo)
+    end
+
+    it 'uses 0 as the protocol' do
+      @addr.protocol.should == 0
+    end
+
+    it 'can be used to connect to the peer' do
+      b = @addr.connect
+      begin
+        b.remote_address.to_s.should == @addr.to_s
+      ensure
+        b.close
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/stringio/ungetbyte_spec.rb b/spec/ruby/library/stringio/ungetbyte_spec.rb
index 701463e621..eb1cc55220 100644
--- a/spec/ruby/library/stringio/ungetbyte_spec.rb
+++ b/spec/ruby/library/stringio/ungetbyte_spec.rb
@@ -1,6 +1,42 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require 'stringio'
 
 describe "StringIO#ungetbyte" do
-  it "needs to be reviewed for spec completeness"
+  it "ungets a single byte from a string starting with a single byte character" do
+    str = 'This is a simple string.'
+    io = StringIO.new("#{str}")
+    c = io.getc
+    c.should == 'T'
+    io.ungetbyte(83)
+    io.string.should == 'Shis is a simple string.'
+  end
+
+  it "ungets a single byte from a string in the middle of a multibyte characte" do
+    str = "\u01a9"
+    io = StringIO.new(str)
+    b = io.getbyte
+    b.should == 0xc6 # First byte of UTF-8 encoding of \u01a9
+    io.ungetbyte(0xce) # First byte of UTF-8 encoding of \u03a9
+    io.string.should == "\u03a9"
+  end
+
+  it "constrains the value of a numeric argument to a single byte" do
+    str = 'This is a simple string.'
+    io = StringIO.new("#{str}")
+    c = io.getc
+    c.should == 'T'
+    io.ungetbyte(83 | 0xff00)
+    io.string.should == 'Shis is a simple string.'
+  end
+
+  it "ungets the bytes of a string if given a string as an arugment" do
+    str = "\u01a9"
+    io = StringIO.new(str)
+    b = io.getbyte
+    b.should == 0xc6 # First byte of UTF-8 encoding of \u01a9
+    io.ungetbyte("\u01a9")
+    io.string.bytes.should == [198, 169, 169]
+  end
+
 end
diff --git a/spec/ruby/library/stringscanner/check_spec.rb b/spec/ruby/library/stringscanner/check_spec.rb
index c7f788f0b3..21da785515 100644
--- a/spec/ruby/library/stringscanner/check_spec.rb
+++ b/spec/ruby/library/stringscanner/check_spec.rb
@@ -13,4 +13,15 @@ describe "StringScanner#check" do
     @s.check(/is/).should == nil
     @s.matched.should == nil
   end
+
+  ruby_version_is "2.7" do
+    it "treats String as the pattern itself" do
+      @s.check("This").should == "This"
+      @s.matched.should == "This"
+      @s.pos.should == 0
+      @s.check(/is/).should == nil
+      @s.matched.should == nil
+    end
+  end
+
 end