Update to ruby/spec@d6921ef

13 files changed, 133 insertions, 336 deletions

diff --git a/spec/ruby/library/conditionvariable/broadcast_spec.rb b/spec/ruby/library/conditionvariable/broadcast_spec.rb
deleted file mode 100644
index d88159df23..0000000000
--- a/spec/ruby/library/conditionvariable/broadcast_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require_relative '../../spec_helper'
-require 'thread'
-
-describe "ConditionVariable#broadcast" do
-  it "releases all threads waiting in line for this resource" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    threads = []
-    r1 = []
-    r2 = []
-
-    # large number to attempt to cause race conditions
-    100.times do |i|
-      threads << Thread.new(i) do |tid|
-        m.synchronize do
-          r1 << tid
-          cv.wait(m)
-          r2 << tid
-        end
-      end
-    end
-
-    # wait for all threads to acquire the mutex the first time
-    Thread.pass until m.synchronize { r1.size == threads.size }
-    # wait until all threads are sleeping (ie waiting)
-    Thread.pass until threads.all?(&:stop?)
-
-    r2.should be_empty
-    m.synchronize do
-      cv.broadcast
-    end
-
-    threads.each {|t| t.join }
-
-    # ensure that all threads that enter cv.wait are released
-    r2.sort.should == r1.sort
-    # note that order is not specified as broadcast results in a race
-    # condition on regaining the lock m
-  end
-end
diff --git a/spec/ruby/library/conditionvariable/marshal_dump_spec.rb b/spec/ruby/library/conditionvariable/marshal_dump_spec.rb
deleted file mode 100644
index f951a13e28..0000000000
--- a/spec/ruby/library/conditionvariable/marshal_dump_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative '../../spec_helper'
-require 'thread'
-
-describe "ConditionVariable#marshal_dump" do
-  it "raises a TypeError" do
-    cv = ConditionVariable.new
-    -> { cv.marshal_dump }.should raise_error(TypeError, /can't dump/)
-  end
-end
diff --git a/spec/ruby/library/conditionvariable/signal_spec.rb b/spec/ruby/library/conditionvariable/signal_spec.rb
deleted file mode 100644
index 86383073f1..0000000000
--- a/spec/ruby/library/conditionvariable/signal_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require_relative '../../spec_helper'
-require 'thread'
-
-describe "ConditionVariable#signal" do
-  it "releases the first thread waiting in line for this resource" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    threads = []
-    r1 = []
-    r2 = []
-
-    # large number to attempt to cause race conditions
-    100.times do |i|
-      threads << Thread.new(i) do |tid|
-        m.synchronize do
-          r1 << tid
-          cv.wait(m)
-          r2 << tid
-        end
-      end
-    end
-
-    # wait for all threads to acquire the mutex the first time
-    Thread.pass until m.synchronize { r1.size == threads.size }
-    # wait until all threads are sleeping (ie waiting)
-    Thread.pass until threads.all?(&:stop?)
-
-    r2.should be_empty
-    100.times do |i|
-      m.synchronize do
-        cv.signal
-      end
-      Thread.pass until r2.size == i+1
-    end
-
-    threads.each {|t| t.join }
-
-    # ensure that all the threads that went into the cv.wait are
-    # released in the same order
-    r2.should == r1
-  end
-
-  it "allows control to be passed between a pair of threads" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    repeats = 100
-    in_synchronize = false
-
-    t1 = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        repeats.times do
-          cv.wait(m)
-          cv.signal
-        end
-      end
-    end
-
-    # Make sure t1 is waiting for a signal before launching t2.
-    Thread.pass until in_synchronize
-    Thread.pass until t1.stop?
-
-    t2 = Thread.new do
-      m.synchronize do
-        repeats.times do
-          cv.signal
-          cv.wait(m)
-        end
-      end
-    end
-
-    # Check that both threads terminated without exception
-    t1.join
-    t2.join
-    m.should_not.locked?
-  end
-end
diff --git a/spec/ruby/library/conditionvariable/wait_spec.rb b/spec/ruby/library/conditionvariable/wait_spec.rb
deleted file mode 100644
index 9a68c2b5a1..0000000000
--- a/spec/ruby/library/conditionvariable/wait_spec.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-require_relative '../../spec_helper'
-require 'thread'
-
-describe "ConditionVariable#wait" do
-  it "calls #sleep on the given object" do
-    o = Object.new
-    o.should_receive(:sleep).with(1234)
-
-    cv = ConditionVariable.new
-
-    cv.wait(o, 1234)
-  end
-
-  it "can be woken up by ConditionVariable#signal" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    in_synchronize = false
-
-    th = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        cv.wait(m)
-      end
-      :success
-    end
-
-    # wait for m to acquire the mutex
-    Thread.pass until in_synchronize
-    # wait until th is sleeping (ie waiting)
-    Thread.pass until th.stop?
-
-    m.synchronize { cv.signal }
-    th.value.should == :success
-  end
-
-  it "can be interrupted by Thread#run" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    in_synchronize = false
-
-    th = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        cv.wait(m)
-      end
-      :success
-    end
-
-    # wait for m to acquire the mutex
-    Thread.pass until in_synchronize
-    # wait until th is sleeping (ie waiting)
-    Thread.pass until th.stop?
-
-    th.run
-    th.value.should == :success
-  end
-
-  it "can be interrupted by Thread#wakeup" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    in_synchronize = false
-
-    th = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        cv.wait(m)
-      end
-      :success
-    end
-
-    # wait for m to acquire the mutex
-    Thread.pass until in_synchronize
-    # wait until th is sleeping (ie waiting)
-    Thread.pass until th.stop?
-
-    th.wakeup
-    th.value.should == :success
-  end
-
-  it "reacquires the lock even if the thread is killed" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    in_synchronize = false
-    owned = nil
-
-    th = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        begin
-          cv.wait(m)
-        ensure
-          owned = m.owned?
-          $stderr.puts "\nThe Thread doesn't own the Mutex!" unless owned
-        end
-      end
-    end
-
-    # wait for m to acquire the mutex
-    Thread.pass until in_synchronize
-    # wait until th is sleeping (ie waiting)
-    Thread.pass until th.stop?
-
-    th.kill
-    th.join
-
-    owned.should == true
-  end
-
-  it "reacquires the lock even if the thread is killed after being signaled" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    in_synchronize = false
-    owned = nil
-
-    th = Thread.new do
-      m.synchronize do
-        in_synchronize = true
-        begin
-          cv.wait(m)
-        ensure
-          owned = m.owned?
-          $stderr.puts "\nThe Thread doesn't own the Mutex!" unless owned
-        end
-      end
-    end
-
-    # wait for m to acquire the mutex
-    Thread.pass until in_synchronize
-    # wait until th is sleeping (ie waiting)
-    Thread.pass until th.stop?
-
-    m.synchronize {
-      cv.signal
-      # Wait that the thread is blocked on acquiring the Mutex
-      sleep 0.001
-      # Kill the thread, yet the thread should first acquire the Mutex before going on
-      th.kill
-    }
-
-    th.join
-    owned.should == true
-  end
-
-  it "supports multiple Threads waiting on the same ConditionVariable and Mutex" do
-    m = Mutex.new
-    cv = ConditionVariable.new
-    n_threads = 4
-    events = []
-
-    threads = n_threads.times.map {
-      Thread.new {
-        m.synchronize {
-          events << :t_in_synchronize
-          cv.wait(m)
-        }
-      }
-    }
-
-    Thread.pass until m.synchronize { events.size } == n_threads
-    Thread.pass until threads.any?(&:stop?)
-    m.synchronize do
-      threads.each { |t|
-        # Cause interactions with the waiting threads.
-        # On TruffleRuby, this causes a safepoint which has interesting
-        # interactions with the ConditionVariable.
-        bt = t.backtrace
-        bt.should be_kind_of(Array)
-        bt.size.should >= 2
-      }
-    end
-
-    cv.broadcast
-    threads.each(&:join)
-  end
-end
diff --git a/spec/ruby/library/ipaddr/new_spec.rb b/spec/ruby/library/ipaddr/new_spec.rb
index 053928c3cf..3148d6e39c 100644
--- a/spec/ruby/library/ipaddr/new_spec.rb
+++ b/spec/ruby/library/ipaddr/new_spec.rb
@@ -77,34 +77,17 @@ describe "IPAddr#new" do
     a.family.should == Socket::AF_INET6
   end
 
-  ruby_version_is ""..."3.1" do
-    it "raises on incorrect IPAddr strings" do
-      [
-        ["fe80::1%fxp0"],
-        ["::1/255.255.255.0"],
-        [IPAddr.new("::1").to_i],
-        ["::ffff:192.168.1.2/120", Socket::AF_INET],
-        ["[192.168.1.2]/120"],
-      ].each { |args|
-        ->{
-          IPAddr.new(*args)
-        }.should raise_error(ArgumentError)
-      }
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "raises on incorrect IPAddr strings" do
-      [
-        ["::1/255.255.255.0"],
-        [IPAddr.new("::1").to_i],
-        ["::ffff:192.168.1.2/120", Socket::AF_INET],
-        ["[192.168.1.2]/120"],
-      ].each { |args|
-        ->{
-          IPAddr.new(*args)
-        }.should raise_error(ArgumentError)
-      }
-    end
+  it "raises on incorrect IPAddr strings" do
+    [
+      ["fe80::1%fxp0"],
+      ["::1/255.255.255.0"],
+      [IPAddr.new("::1").to_i],
+      ["::ffff:192.168.1.2/120", Socket::AF_INET],
+      ["[192.168.1.2]/120"],
+    ].each { |args|
+      ->{
+        IPAddr.new(*args)
+      }.should raise_error(ArgumentError)
+    }
   end
 end
diff --git a/spec/ruby/library/set/comparison_spec.rb b/spec/ruby/library/set/comparison_spec.rb
new file mode 100644
index 0000000000..b851ea3d57
--- /dev/null
+++ b/spec/ruby/library/set/comparison_spec.rb
@@ -0,0 +1,29 @@
+require_relative '../../spec_helper'

+require 'set'

+

+ruby_version_is "3.0" do

+  describe "Set#<=>" do

+    it "returns 0 if the sets are equal" do

+      (Set[] <=> Set[]).should == 0

+      (Set[:a, :b, :c] <=> Set[:a, :b, :c]).should == 0

+    end

+

+    it "returns -1 if the set is a proper subset of the other set" do

+      (Set[] <=> Set[1]).should == -1

+      (Set[1, 2] <=> Set[1, 2, 3]).should == -1

+    end

+

+    it "returns +1 if the set is a proper superset of other set" do

+      (Set[1] <=> Set[]).should == +1

+      (Set[1, 2, 3] <=> Set[1, 2]).should == +1

+    end

+

+    it "returns nil if the set has unique elements" do

+      (Set[1, 2, 3] <=> Set[:a, :b, :c]).should be_nil

+    end

+

+    it "returns nil when the argument is not set-like" do

+      (Set[] <=> false).should be_nil

+    end

+  end

+end

diff --git a/spec/ruby/library/set/initialize_clone_spec.rb b/spec/ruby/library/set/initialize_clone_spec.rb
new file mode 100644
index 0000000000..62985987fa
--- /dev/null
+++ b/spec/ruby/library/set/initialize_clone_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+require 'set'
+
+describe "Set#initialize_clone" do
+  ruby_version_is "3.0" do
+    # See https://bugs.ruby-lang.org/issues/14266
+    it "does not freeze the new Set when called from clone(freeze: false)" do
+      set1 = Set[1, 2]
+      set1.freeze
+      set2 = set1.clone(freeze: false)
+      set1.frozen?.should == true
+      set2.frozen?.should == false
+      set2.add 3
+      set1.should == Set[1, 2]
+      set2.should == Set[1, 2, 3]
+    end
+  end
+end
diff --git a/spec/ruby/library/set/join_spec.rb b/spec/ruby/library/set/join_spec.rb
new file mode 100644
index 0000000000..7498a91d98
--- /dev/null
+++ b/spec/ruby/library/set/join_spec.rb
@@ -0,0 +1,31 @@
+require_relative '../../spec_helper'
+require 'set'
+
+ruby_version_is "3.0" do
+  describe "Set#join" do
+    it "returns an empty string if the Set is empty" do
+      Set[].join.should == ''
+    end
+
+    it "returns a new string formed by joining elements after conversion" do
+      set = Set[:a, :b, :c]
+      set.join.should == "abc"
+    end
+
+    it "does not separate elements when the passed separator is nil" do
+      set = Set[:a, :b, :c]
+      set.join(nil).should == "abc"
+    end
+
+    it "returns a string formed by concatenating each element separated by the separator" do
+      set = Set[:a, :b, :c]
+      set.join(' | ').should == "a | b | c"
+    end
+
+    it "calls #to_a to convert the Set in to an Array" do
+      set = Set[:a, :b, :c]
+      set.should_receive(:to_a).and_return([:a, :b, :c])
+      set.join.should == "abc"
+    end
+  end
+end
diff --git a/spec/ruby/library/set/sortedset/sortedset_spec.rb b/spec/ruby/library/set/sortedset/sortedset_spec.rb
new file mode 100644
index 0000000000..3ead5495fc
--- /dev/null
+++ b/spec/ruby/library/set/sortedset/sortedset_spec.rb
@@ -0,0 +1,22 @@
+require_relative '../../../spec_helper'
+require 'set'
+
+ruby_version_is "3.0" do
+  describe "SortedSet" do
+    it "raises error including message that it has been extracted from the set stdlib" do
+      -> {
+        SortedSet
+      }.should raise_error(RuntimeError) { |e|
+        e.message.should.include?("The `SortedSet` class has been extracted from the `set` library")
+      }
+    end
+  end
+end
+
+ruby_version_is ""..."3.0" do
+  describe "SortedSet" do
+    it "is part of the set stdlib" do
+      SortedSet.superclass.should == Set
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
index a3cee05412..065c8f4190 100644
--- a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
@@ -1,5 +1,10 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
+require_relative 'shared/new'
+
+describe 'TCPSocket#initialize' do
+  it_behaves_like :tcpsocket_new, :new
+end
 
 describe 'TCPSocket#initialize' do
   SocketSpecs.each_ip_protocol do |family, ip_address|
diff --git a/spec/ruby/library/socket/tcpsocket/new_spec.rb b/spec/ruby/library/socket/tcpsocket/new_spec.rb
deleted file mode 100644
index 4924468be7..0000000000
--- a/spec/ruby/library/socket/tcpsocket/new_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative 'shared/new'
-
-describe "TCPSocket.new" do
-  it_behaves_like :tcpsocket_new, :new
-end
diff --git a/spec/ruby/library/socket/tcpsocket/shared/new.rb b/spec/ruby/library/socket/tcpsocket/shared/new.rb
index 5ca3a0e6cc..4189acc2f8 100644
--- a/spec/ruby/library/socket/tcpsocket/shared/new.rb
+++ b/spec/ruby/library/socket/tcpsocket/shared/new.rb
@@ -14,6 +14,14 @@ describe :tcpsocket_new, shared: true do
     }
   end
 
+  ruby_version_is "3.0" do
+    it 'raises Errno::ETIMEDOUT with :connect_timeout when no server is listening on the given address' do
+      -> {
+        TCPSocket.send(@method, "192.0.2.1", 80, connect_timeout: 0)
+      }.should raise_error(Errno::ETIMEDOUT)
+    end
+  end
+
   describe "with a running server" do
     before :each do
       @server = SocketSpecs::SpecTCPServer.new
@@ -75,5 +83,12 @@ describe :tcpsocket_new, shared: true do
       @socket.addr[1].should be_kind_of(Integer)
       @socket.addr[2].should =~ /^#{@hostname}/
     end
+
+    ruby_version_is "3.0" do
+      it "connects to a server when passed connect_timeout argument" do
+        @socket = TCPSocket.send(@method, @hostname, @server.port, connect_timeout: 1)
+        @socket.should be_an_instance_of(TCPSocket)
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringio/ungetbyte_spec.rb b/spec/ruby/library/stringio/ungetbyte_spec.rb
index 2f082acbf6..eb1cc55220 100644
--- a/spec/ruby/library/stringio/ungetbyte_spec.rb
+++ b/spec/ruby/library/stringio/ungetbyte_spec.rb
@@ -30,7 +30,7 @@ describe "StringIO#ungetbyte" do
     io.string.should == 'Shis is a simple string.'
   end
 
-  it "ungets the bytes of a string if given a string as an argument" do
+  it "ungets the bytes of a string if given a string as an arugment" do
     str = "\u01a9"
     io = StringIO.new(str)
     b = io.getbyte