Update to ruby/spec@4cd727a

Author: eregon

spec/ruby/core/binding/fixtures/irbrc

@@ -0,0 +1 @@
+# empty configuration

spec/ruby/core/binding/irb_spec.rb

@@ -4,8 +4,9 @@
   describe "Binding#irb" do
     it "creates an IRB session with the binding in scope" do
       irb_fixture = fixture __FILE__, "irb.rb"
+      irbrc_fixture = fixture __FILE__, "irbrc"
 
-      out = IO.popen([*ruby_exe, irb_fixture], "r+") do |pipe|
+      out = IO.popen([{"IRBRC"=>irbrc_fixture}, *ruby_exe, irb_fixture], "r+") do |pipe|
         pipe.puts "a ** 2"
         pipe.puts "exit"
         pipe.readlines.map(&:chomp)

spec/ruby/core/enumerable/tally_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is "2.7" do
+  describe "Enumerable#tally" do
+    before :each do
+      ScratchPad.record []
+    end
+
+    it "returns a hash with counts according to the value" do
+      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+      enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+    end
+
+    it "returns a hash without default" do
+      hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
+      hash.default_proc.should be_nil
+      hash.default.should be_nil
+    end
+
+    it "returns an empty hash for empty enumerables" do
+      EnumerableSpecs::Empty.new.tally.should == {}
+    end
+
+    it "counts values as gathered array when yielded with multiple arguments" do
+      EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
+    end
+
+    it "does not call given block" do
+      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+      enum.tally { |v| ScratchPad << v }
+      ScratchPad.recorded.should == []
+    end
+  end
+end

spec/ruby/core/file/fixtures/file_types.rb

@@ -52,9 +52,9 @@ def self.symlink
   end
 
   def self.socket
-    require 'socket'
-    name = tmp("ftype_socket.socket")
-    rm_r name
+    require_relative '../../../library/socket/fixtures/classes.rb'
+
+    name = SocketSpecs.socket_path
     socket = UNIXServer.new name
     begin
       yield name

spec/ruby/core/file/stat/ftype_spec.rb

@@ -55,10 +55,6 @@
       end
     end
 
-    # This will silently not execute the block if no socket
-    # can be found. However, if you are running X, there is
-    # a good chance that if nothing else, at least the X
-    # Server socket exists.
     it "returns 'socket' when the file is a socket" do
       FileSpecs.socket do |socket|
         File.lstat(socket).ftype.should == 'socket'

spec/ruby/core/process/fixtures/clocks.rb

@@ -11,7 +11,7 @@ def self.clock_constants
       clocks -= [:CLOCK_BOOTTIME_ALARM, :CLOCK_REALTIME_ALARM]
     end
 
-    clocks.map { |c|
+    clocks.sort.map { |c|
       [c, Process.const_get(c)]
     }
   end

spec/ruby/core/process/getrlimit_spec.rb

@@ -41,9 +41,9 @@
     end
 
     context "when passed a Symbol" do
-      Process.constants.grep(/\ARLIMIT_/) do |fullname|
-        short = $'
-        it "coerces :#{short} into #{fullname}" do
+      it "coerces the short name into the full RLIMIT_ prefixed name" do
+        Process.constants.grep(/\ARLIMIT_/) do |fullname|
+          short = fullname[/\ARLIMIT_(.+)/, 1]
           Process.getrlimit(short.to_sym).should == Process.getrlimit(Process.const_get(fullname))
         end
       end
@@ -54,9 +54,9 @@
     end
 
     context "when passed a String" do
-      Process.constants.grep(/\ARLIMIT_/) do |fullname|
-        short = $'
-        it "coerces '#{short}' into #{fullname}" do
+      it "coerces the short name into the full RLIMIT_ prefixed name" do
+        Process.constants.grep(/\ARLIMIT_/) do |fullname|
+          short = fullname[/\ARLIMIT_(.+)/, 1]
           Process.getrlimit(short).should == Process.getrlimit(Process.const_get(fullname))
         end
       end

spec/ruby/core/signal/fixtures/trap_all.rb

@@ -1,8 +1,15 @@
-reserved_signals = ARGV
+cannot_be_trapped = %w[KILL STOP] # See man 2 signal
 
-(Signal.list.keys - reserved_signals).each do |signal|
-  Signal.trap(signal, -> {})
-  Signal.trap(signal, "DEFAULT")
+(Signal.list.keys - cannot_be_trapped).each do |signal|
+  begin
+    Signal.trap(signal, -> {})
+  rescue ArgumentError => e
+    unless /can't trap reserved signal|Signal already used by VM or OS/ =~ e.message
+      raise e
+    end
+  else
+    Signal.trap(signal, "DEFAULT")
+  end
 end
 
 puts "OK"

spec/ruby/core/signal/trap_spec.rb

@@ -115,24 +115,8 @@
   end
 
   describe "Signal.trap" do
-    cannot_be_trapped = %w[KILL STOP] # See man 2 signal
-    reserved_signals = %w[VTALRM]
-
-    if PlatformGuard.implementation?(:ruby)
-      reserved_signals += %w[SEGV ILL FPE BUS]
-    end
-
-    if PlatformGuard.implementation?(:truffleruby)
-      if !TruffleRuby.native?
-        reserved_signals += %w[SEGV ILL FPE USR1 QUIT]
-      end
-    end
-
-    if PlatformGuard.implementation?(:jruby)
-      reserved_signals += %w[SEGV ILL FPE BUS USR1 QUIT]
-    end
-
-    cannot_be_trapped.each do |signal|
+    # See man 2 signal
+    %w[KILL STOP].each do |signal|
       it "raises ArgumentError or Errno::EINVAL for SIG#{signal}" do
         -> {
           trap(signal, -> {})
@@ -143,17 +127,8 @@
       end
     end
 
-    reserved_signals.each do |signal|
-      it "raises ArgumentError for reserved signal: SIG#{signal}" do
-        -> {
-          trap(signal, -> {})
-        }.should raise_error(ArgumentError, /can't trap reserved signal|Signal already used by VM or OS/)
-      end
-    end
-
-    it "allows to register a handler for all known signals, except reserved signals" do
-      excluded = cannot_be_trapped + reserved_signals
-      out = ruby_exe(fixture(__FILE__, "trap_all.rb"), args: [*excluded, "2>&1"])
+    it "allows to register a handler for all known signals, except reserved signals for which it raises ArgumentError" do
+      out = ruby_exe(fixture(__FILE__, "trap_all.rb"), args: "2>&1")
       out.should == "OK\n"
       $?.exitstatus.should == 0
     end

spec/ruby/library/socket/fixtures/classes.rb

@@ -132,4 +132,33 @@ def log(message)
       @logger.puts message if @logger
     end
   end
+
+  # We need to find a free port for Socket.tcp_server_loop and Socket.udp_server_loop,
+  # and the only reliable way to do that is to pass 0 as the port, but then we need to
+  # find out which one was chosen and the API doesn't let us find what it is. So we
+  # intercept one of the public API methods called by these methods.
+  class ServerLoopPortFinder < Socket
+    def self.tcp_server_sockets(*args)
+      super(*args) { |sockets|
+        @port = sockets.first.local_address.ip_port
+        yield(sockets)
+      }
+    end
+
+    def self.udp_server_sockets(*args, &block)
+      super(*args) { |sockets|
+        @port = sockets.first.local_address.ip_port
+        yield(sockets)
+      }
+    end
+
+    def self.cleanup
+      @port = nil
+    end
+
+    def self.port
+      sleep 0.001 until @port
+      @port
+    end
+  end
 end