[GR-14806] Update specs

PullRequest: truffleruby/3317

Author: eregon

ci.jsonnet

@@ -316,8 +316,7 @@ local part_definitions = {
         "CHECK_LEAKS": "true",
       },
       run+: jt(["-u", mri_path(mri_version), "mspec", "spec/ruby"]) +
-            jt(["-u", mri_path("2.7.2"), "mspec", "spec/ruby"]) +
-            jt(["-u", mri_path("2.6.6"), "mspec", "spec/ruby"]),
+            jt(["-u", mri_path("2.7.2"), "mspec", "spec/ruby"]),
     },
 
     test_fast: {

spec/mspec/lib/mspec/runner/actions/timeout.rb

@@ -8,6 +8,7 @@ def initialize(timeout)
   def register
     MSpec.register :start, self
     MSpec.register :before, self
+    MSpec.register :after, self
     MSpec.register :finish, self
   end
 
@@ -35,8 +36,12 @@ def start
           if @queue.empty?
             elapsed = now - @started
             if elapsed > @timeout
-              STDERR.puts "\n#{@current_state.description}"
-              STDERR.puts "Example took longer than the configured timeout of #{@timeout}s"
+              if @current_state
+                STDERR.puts "\nExample took longer than the configured timeout of #{@timeout}s:"
+                STDERR.puts "#{@current_state.description}"
+              else
+                STDERR.puts "\nSome code outside an example took longer than the configured timeout of #{@timeout}s"
+              end
               STDERR.flush
 
               show_backtraces
@@ -56,6 +61,12 @@ def before(state = nil)
     end
   end
 
+  def after(state = nil)
+    @queue << -> do
+      @current_state = nil
+    end
+  end
+
   def finish
     @thread.kill
     @thread.join
@@ -73,7 +84,9 @@ def finish
       Truffle::Debug.show_backtraces
     else
       Thread.list.each do |thread|
-        STDERR.puts thread.inspect, thread.backtrace, ''
+        unless thread == Thread.current
+          STDERR.puts thread.inspect, thread.backtrace, ''
+        end
       end
     end
   end

spec/ruby/.rubocop.yml

@@ -1,11 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
   Exclude:
     - command_line/fixtures/bad_syntax.rb
   DisabledByDefault: true
+  NewCops: disable
 
 Layout/TrailingWhitespace:
   Enabled: true
@@ -56,12 +57,52 @@ Lint/UnusedMethodArgument:
 Lint/UselessAssignment:
   Enabled: false
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: false
 
+Lint/EmptyConditionalBody:
+  Enabled: false # buggy
+
 Lint/Void:
   Enabled: false
 
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Lint/RaiseException:
+  Enabled: false
+
+Lint/FloatComparison:
+  Enabled: false
+
+Lint/DeprecatedClassMethods:
+  Enabled: false
+
+Lint/UnreachableLoop:
+  Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false
+
+Lint/UselessMethodDefinition:
+  Enabled: false
+
+Lint/UselessTimes:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Lint/DuplicateElsifCondition:
+  Enabled: false
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+
+Lint/ElseLayout:
+  Exclude:
+    - 'language/if_spec.rb'
+
 Lint/EmptyExpression:
   Exclude:
     - 'language/**/*.rb'

spec/ruby/CONTRIBUTING.md

@@ -13,12 +13,14 @@ Spec are grouped in 5 separate top-level groups:
 * `optional/capi`: for functions available to the Ruby C-extension API
 
 The exact file for methods is decided by the `#owner` of a method, for instance for `#group_by`:
+
 ```ruby
 > [].method(:group_by)
 => #<Method: Array(Enumerable)#group_by>
 > [].method(:group_by).owner
 => Enumerable
 ```
+
 Which should therefore be specified in `core/enumerable/group_by_spec.rb`.
 
 ### MkSpec - a tool to generate the spec structure
@@ -178,7 +180,7 @@ First, file a bug at https://bugs.ruby-lang.org/.
 It is better to use a `ruby_version_is` guard if there was a release with the fix.
 
 ```ruby
-ruby_bug '#13669', ''...'2.7' do
+ruby_bug '#13669', ''...'3.2' do
   it "works like this" do
     # Specify the expected behavior here, not the bug
   end
@@ -220,7 +222,7 @@ If an implementation does not support some feature, simply tag the related specs
 ### Shared Specs
 
 Often throughout Ruby, identical functionality is used by different methods and modules. In order
-to avoid duplication of specs, we have shared specs that are re-used in other specs.  The use is a
+to avoid duplication of specs, we have shared specs that are re-used in other specs. The use is a
 bit tricky however, so let's go over it.
 
 Commonly, if a shared spec is only reused within its own module, the shared spec will live within a
@@ -232,7 +234,7 @@ An example of this is the `shared/file/socket.rb` which is used by `core/file/so
 `core/filetest/socket_spec.rb`, and `core/file/state/socket_spec.rb` and so it lives in the root `shared/`.
 
 Defining a shared spec involves adding a `shared: true` option to the top-level `describe` block. This
-will signal not to run the specs directly by the runner.  Shared specs have access to two instance
+will signal not to run the specs directly by the runner. Shared specs have access to two instance
 variables from the implementor spec: `@method` and `@object`, which the implementor spec will pass in.
 
 Here's an example of a snippet of a shared spec and two specs which integrates it:
@@ -257,12 +259,12 @@ end
 ```
 
 In the example, the first `describe` defines the shared spec `:hash_key_p`, which defines a spec that
-calls the `@method` method with an expectation.  In the implementor spec, we use `it_behaves_like` to
-integrate the shared spec.  `it_behaves_like` takes 3 parameters: the key of the shared spec, a method,
-and an object.  These last two parameters are accessible via `@method` and `@object` in the shared spec.
+calls the `@method` method with an expectation. In the implementor spec, we use `it_behaves_like` to
+integrate the shared spec. `it_behaves_like` takes 3 parameters: the key of the shared spec, a method,
+and an object. These last two parameters are accessible via `@method` and `@object` in the shared spec.
 
 Sometimes, shared specs require more context from the implementor class than a simple object. We can address
-this by passing a lambda as the method, which will have the scope of the implementor.  Here's an example of
+this by passing a lambda as the method, which will have the scope of the implementor. Here's an example of
 how this is used currently:
 
 ```ruby

spec/ruby/README.md

@@ -24,14 +24,15 @@ The specs describe the [language syntax](language/), the [core library](core/),
 The language specs are grouped by keyword while the core and standard library specs are grouped by class and method.
 
 ruby/spec is known to be tested in these implementations for every commit:
+
 * [MRI](https://rubyci.org/) on 30 platforms and 4 versions
 * [JRuby](https://github.com/jruby/jruby/tree/master/spec/ruby) for both 1.7 and 9.x
 * [TruffleRuby](https://github.com/oracle/truffleruby/tree/master/spec/ruby)
 * [Opal](https://github.com/opal/opal/tree/master/spec)
 * [Artichoke](https://github.com/artichoke/spec/tree/artichoke-vendor)
 
-ruby/spec describes the behavior of Ruby 2.6 and more recent Ruby versions.
-More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (2.6.x, 2.7.x, 3.0.x, etc), and those are tested in CI.
+ruby/spec describes the behavior of Ruby 2.7 and more recent Ruby versions.
+More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (2.7.x, 3.0.x, 3.1.x, etc), and those are tested in CI.
 
 ### Synchronization with Ruby Implementations
 
@@ -53,12 +54,14 @@ $ ../mspec/bin/mspec
 ### Specs for old Ruby versions
 
 For older specs try these commits:
+
 * Ruby 2.0.0-p647 - [Suite](https://github.com/ruby/spec/commit/245862558761d5abc676843ef74f86c9bcc8ea8d) using [MSpec](https://github.com/ruby/mspec/commit/f90efa068791064f955de7a843e96e2d7d3041c2) (may encounter 2 failures)
 * Ruby 2.1.9 - [Suite](https://github.com/ruby/spec/commit/f029e65241374386077ac500add557ae65069b55) using [MSpec](https://github.com/ruby/mspec/commit/55568ea3918c6380e64db8c567d732fa5781efed)
 * Ruby 2.2.10 - [Suite](https://github.com/ruby/spec/commit/cbaa0e412270c944df0c2532fc500c920dba0e92) using [MSpec](https://github.com/ruby/mspec/commit/d84d7668449e96856c5f6bac8cb1526b6d357ce3)
 * Ruby 2.3.8 - [Suite](https://github.com/ruby/spec/commit/dc733114d8ae66a3368ba3a98422c50147a76ba5) using [MSpec](https://github.com/ruby/mspec/commit/4599bc195fb109f2a482a01c32a7d659518369ea)
 * Ruby 2.4.10 - [Suite](https://github.com/ruby/spec/commit/bce4f2b81d6c31db67cf4d023a0625ceadde59bd) using [MSpec](https://github.com/ruby/mspec/commit/e7eb8aa4c26495b7b461e687d950b96eb08b3ff2)
 * Ruby 2.5.9 - [Suite](https://github.com/ruby/spec/commit/c503335d3d9f6ec6ef24de60a0716c34af69b64f) using [MSpec](https://github.com/ruby/mspec/commit/0091e8a62e954717cd54641f935eaf1403692041)
+* Ruby 2.6.10 - [Suite](https://github.com/ruby/spec/commit/aaf998fb8c92c4e63ad423a2e7ca6e6921818c6e) using [MSpec](https://github.com/ruby/mspec/commit/5e36c684e9e2b92b1187589bba1df22c640a8661)
 
 ### Running the specs
 

spec/ruby/command_line/dash_upper_w_spec.rb

@@ -19,29 +19,26 @@
   it_behaves_like :command_line_verbose, "-W2"
 end
 
-# Regarding the defaults, see core/warning/element_reference_spec.rb
-ruby_version_is "2.7" do
-  describe "The -W command line option with :deprecated" do
-    it "enables deprecation warnings" do
-      ruby_exe('p Warning[:deprecated]', options: '-W:deprecated').should == "true\n"
-    end
+describe "The -W command line option with :deprecated" do
+  it "enables deprecation warnings" do
+    ruby_exe('p Warning[:deprecated]', options: '-W:deprecated').should == "true\n"
   end
+end
 
-  describe "The -W command line option with :no-deprecated" do
-    it "suppresses deprecation warnings" do
-      ruby_exe('p Warning[:deprecated]', options: '-w -W:no-deprecated').should == "false\n"
-    end
+describe "The -W command line option with :no-deprecated" do
+  it "suppresses deprecation warnings" do
+    ruby_exe('p Warning[:deprecated]', options: '-w -W:no-deprecated').should == "false\n"
   end
+end
 
-  describe "The -W command line option with :experimental" do
-    it "enables experimental warnings" do
-      ruby_exe('p Warning[:experimental]', options: '-W:experimental').should == "true\n"
-    end
+describe "The -W command line option with :experimental" do
+  it "enables experimental warnings" do
+    ruby_exe('p Warning[:experimental]', options: '-W:experimental').should == "true\n"
   end
+end
 
-  describe "The -W command line option with :no-experimental" do
-    it "suppresses experimental warnings" do
-      ruby_exe('p Warning[:experimental]', options: '-w -W:no-experimental').should == "false\n"
-    end
+describe "The -W command line option with :no-experimental" do
+  it "suppresses experimental warnings" do
+    ruby_exe('p Warning[:experimental]', options: '-w -W:no-experimental').should == "false\n"
   end
 end

spec/ruby/command_line/dash_w_spec.rb

@@ -4,9 +4,7 @@
 describe "The -w command line option" do
   it_behaves_like :command_line_verbose, "-w"
 
-  ruby_version_is "2.7" do
-    it "enables both deprecated and experimental warnings" do
-      ruby_exe('p Warning[:deprecated]; p Warning[:experimental]', options: '-w').should == "true\ntrue\n"
-    end
+  it "enables both deprecated and experimental warnings" do
+    ruby_exe('p Warning[:deprecated]; p Warning[:experimental]', options: '-w').should == "true\ntrue\n"
   end
 end

spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb

@@ -1 +1 @@
-p "abc".object_id == "abc".object_id
+p "abc".equal?("abc")

spec/ruby/command_line/rubyopt_spec.rb

@@ -59,24 +59,22 @@
     ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
   end
 
-  ruby_version_is "2.7" do
-    it "suppresses deprecation warnings for '-W:no-deprecated'" do
-      ENV["RUBYOPT"] = '-W:no-deprecated'
-      result = ruby_exe('$; = ""', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses deprecation warnings for '-W:no-deprecated'" do
+    ENV["RUBYOPT"] = '-W:no-deprecated'
+    result = ruby_exe('$; = ""', args: '2>&1')
+    result.should == ""
+  end
 
-    it "suppresses experimental warnings for '-W:no-experimental'" do
-      ENV["RUBYOPT"] = '-W:no-experimental'
-      result = ruby_exe('case 0; in a; end', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses experimental warnings for '-W:no-experimental'" do
+    ENV["RUBYOPT"] = '-W:no-experimental'
+    result = ruby_exe('case 0; in a; end', args: '2>&1')
+    result.should == ""
+  end
 
-    it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
-      ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
-      result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
-      result.should == ""
-    end
+  it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
+    ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
+    result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
+    result.should == ""
   end
 
   it "requires the file for '-r'" do

spec/ruby/core/array/clear_spec.rb

@@ -20,30 +20,10 @@
     a.size.should == 0
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps tainted status" do
-      a = [1]
-      a.taint
-      a.tainted?.should be_true
-      a.clear
-      a.tainted?.should be_true
-    end
-  end
-
   it "does not accept any arguments" do
     -> { [1].clear(true) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "keeps untrusted status" do
-      a = [1]
-      a.untrust
-      a.untrusted?.should be_true
-      a.clear
-      a.untrusted?.should be_true
-    end
-  end
-
   it "raises a FrozenError on a frozen array" do
     a = [1]
     a.freeze