[前][次][番号順一覧][スレッド一覧]

ruby-changes:57128

From: Hiroshi <ko1@a...>
Date: Sat, 17 Aug 2019 15:37:25 +0900 (JST)
Subject: [ruby-changes:57128] Hiroshi SHIBATA: 06fcf88d69 (master): Use the original require for test_race_exception

https://git.ruby-lang.org/ruby.git/commit/?id=06fcf88d69

From 06fcf88d695c8bfb6703966dd26629642ff7bf2d Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Sat, 17 Aug 2019 12:19:49 +0900
Subject: Use the original require for test_race_exception

  The extension for require method with rubygems affects this test
  case. We need to keep this test for the original method.

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 6c4b97d..f96155a 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -552,7 +552,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L552
       t1 = Thread.new do
         Thread.pass until start
         begin
-          require(path)
+          Kernel.send(:require, path)
         rescue RuntimeError
         end
 
@@ -561,7 +561,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L561
 
       t2 = Thread.new do
         Thread.pass until scratch[0]
-        t2_res = require(path)
+        t2_res = Kernel.send(:require, path)
       end
 
       t1[:scratch] = t2[:scratch] = scratch
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]