[GR-14806] Update specs.

PullRequest: truffleruby/1728

Author: eregon

lib/truffle/timeout.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # = timeout.rb
 #
@@ -47,10 +48,11 @@ class Error < RuntimeError
   # Represents +thr+ asking for it to be timeout at in +secs+
   # seconds. At timeout, raise +exc+.
   class TimeoutRequest
-    def initialize(secs, thr, exc)
+    def initialize(secs, thr, exc, message)
       @left = secs
       @thread = thr
       @exception = exc
+      @message = message
     end
 
     attr_reader :thread, :left
@@ -65,7 +67,7 @@ def elapsed(time)
     # Raise @exception if @thread.
     def cancel
       if @thread and @thread.alive?
-        @thread.raise @exception, 'execution expired'
+        @thread.raise @exception, @message
       end
 
       @left = 0
@@ -126,8 +128,8 @@ def self.ensure_timeout_thread_running
     end
   end
 
-  def self.add_timeout(time, exc)
-    r = TimeoutRequest.new(time, Thread.current, exc)
+  def self.add_timeout(time, exc, message)
+    r = TimeoutRequest.new(time, Thread.current, exc, message)
     @chan << r
     ensure_timeout_thread_running
     r
@@ -136,7 +138,7 @@ def self.add_timeout(time, exc)
 
   if Truffle::Boot.single_threaded?
 
-    def timeout(sec, exception=Error)
+    def timeout(sec, exception = Error, message = nil)
       Truffle::Debug.log_warning 'threads are disabled, so timeout is being ignored'
       yield sec
     end
@@ -152,12 +154,11 @@ def timeout(sec, exception=Error)
     # Timeout' into your classes so they have a #timeout method, as well as a
     # module method, so you can call it directly as Timeout.timeout().
 
-    def timeout(sec, exception=Error)
+    def timeout(sec, exception = Error, message = nil)
       return yield if sec == nil or sec.zero?
-      raise ThreadError, 'timeout within critical session' if Thread.respond_to?(:critical) && Thread.critical
-
-      req = Timeout.add_timeout sec, exception
 
+      message ||= 'execution expired'
+      req = Timeout.add_timeout sec, exception, message
       begin
         yield sec
       ensure

spec/mspec/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/ruby/mspec.svg?branch=master)](https://travis-ci.org/ruby/mspec)
-
 ## Overview
 
 MSpec is a specialized framework that is syntax-compatible with RSpec 2 for

spec/mspec/tool/sync/sync-rubyspec.rb

@@ -35,6 +35,9 @@
 BRIGHT_YELLOW = "\e[33;1m"
 RESET = "\e[0m"
 
+# git filter-branch --subdirectory-filter works fine for our use case
+ENV['FILTER_BRANCH_SQUELCH_WARNING'] = '1'
+
 class RubyImplementation
   attr_reader :name
 

spec/ruby/.rubocop.yml

@@ -15,6 +15,10 @@ Layout/TrailingEmptyLines:
   Exclude:
     - library/coverage/fixtures/some_class.rb
 
+Layout/SpaceInLambdaLiteral:
+  Enabled: true
+  EnforcedStyle: require_space
+
 Lint:
   Enabled: true
 

spec/ruby/core/env/delete_spec.rb

@@ -30,6 +30,13 @@
     ScratchPad.recorded.should == "foo"
   end
 
+  ruby_version_is "2.8" do
+    it "returns the result of given block if the named environment variable does not exist" do
+      ENV.delete("foo")
+      ENV.delete("foo") { |name| "bar" }.should == "bar"
+    end
+  end
+
   it "does not evaluate the block if the environment variable exists" do
     ENV["foo"] = "bar"
     ENV.delete("foo") { |name| fail "Should not happen" }

spec/ruby/core/exception/no_method_error_spec.rb

@@ -103,6 +103,24 @@ def inspect
       message.should include test_class.inspect
     end
   end
+
+  ruby_version_is "2.8" do
+    it "uses #name to display the receiver if it is a class or a module" do
+      klass = Class.new { def self.name; "MyClass"; end }
+      begin
+        klass.foo
+      rescue NoMethodError => error
+        error.message.lines.first.should == "undefined method `foo' for MyClass:Class"
+      end
+
+      mod = Module.new { def self.name; "MyModule"; end }
+      begin
+        mod.foo
+      rescue NoMethodError => error
+        error.message.lines.first.should == "undefined method `foo' for MyModule:Module"
+      end
+    end
+  end
 end
 
 describe "NoMethodError#dup" do

spec/ruby/core/io/ioctl_spec.rb

@@ -20,12 +20,12 @@
       end
     end
 
-    it "raises an Errno error when ioctl fails" do
+    it "raises a system call error when ioctl fails" do
       File.open(__FILE__, 'r') do |f|
         -> {
           # TIOCGWINSZ in /usr/include/asm-generic/ioctls.h
           f.ioctl 0x5413, nil
-        }.should raise_error(Errno::ENOTTY)
+        }.should raise_error(SystemCallError)
       end
     end
   end

spec/ruby/core/kernel/fixtures/classes.rb

@@ -350,7 +350,7 @@ class ForwardBlockWithZSuper
 
     module Ampersand
       def lambda(&block)
-        super(&block)
+        suppress_warning {super(&block)}
       end
     end
 

spec/ruby/core/kernel/lambda_spec.rb

@@ -33,7 +33,7 @@
 
   it "returns the passed Proc if given an existing Proc" do
     some_proc = proc {}
-    l = lambda(&some_proc)
+    l = suppress_warning {lambda(&some_proc)}
     l.should equal(some_proc)
     l.lambda?.should be_false
   end
@@ -55,7 +55,7 @@
 
   it "does not create lambda-style Procs when captured with #method" do
     kernel_lambda = method(:lambda)
-    l = kernel_lambda.call { 42 }
+    l = suppress_warning {kernel_lambda.call { 42 }}
     l.lambda?.should be_false
     l.call(:extra).should == 42
   end

spec/ruby/core/kernel/proc_spec.rb

@@ -36,27 +36,31 @@ def test
 end
 
 describe "Kernel#proc" do
+  def some_method
+    proc
+  end
+
   ruby_version_is ""..."2.7" do
     it "uses the implicit block from an enclosing method" do
-      def some_method
-        proc
-      end
-
       prc = some_method { "hello" }
 
       prc.call.should == "hello"
     end
   end
 
-  ruby_version_is "2.7" do
+  ruby_version_is "2.7"..."2.8" do
     it "can be created when called with no block" do
-      def some_method
-        proc
-      end
-
       -> {
         some_method { "hello" }
       }.should complain(/Capturing the given block using Kernel#proc is deprecated/)
     end
   end
+
+  ruby_version_is "2.8" do
+    it "raises an ArgumentError when passed no block" do
+      -> {
+        some_method { "hello" }
+      }.should raise_error(ArgumentError, 'tried to create Proc object without a block')
+    end
+  end
 end