diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-01 22:31:30 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-01 22:31:30 +0000 |
| commit | fe38158f9bfe14b7e4b28f5e3e05f371dee429d8 (patch) | |
| tree | 8570bba2c9c88bc8191999885f3967cf30b26c61 | |
| parent | 046831094b355d8d293d22a3ad5be5332307c96c (diff) | |
* test/ruby/envutil.rb (default_warning): New method.
* test/ruby/test_autoload.rb: Use EnvUtil.default_warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 8 | ||||
| -rw-r--r-- | test/ruby/test_autoload.rb | 4 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Jun 2 07:30:33 2014 Tanaka Akira <akr@fsij.org> + + * test/ruby/envutil.rb (default_warning): New method. + + * test/ruby/test_autoload.rb: Use EnvUtil.default_warning. + Mon Jun 2 07:05:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/encoding.h: constify `rb_encoding` arguments. diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index dd72daf477..e9a60ed5e0 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -122,6 +122,14 @@ module EnvUtil end module_function :verbose_warning + def default_warning + verbose, $VERBOSE = $VERBOSE, false + yield + ensure + $VERBOSE = verbose + end + module_function :default_warning + def suppress_warning verbose, $VERBOSE = $VERBOSE, nil yield diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb index 867aa066dd..0dbf613fea 100644 --- a/test/ruby/test_autoload.rb +++ b/test/ruby/test_autoload.rb @@ -74,7 +74,7 @@ p Foo::Bar def test_threaded_accessing_constant # Suppress "warning: loading in progress, circular require considered harmful" - EnvUtil.suppress_warning { + EnvUtil.default_warning { Tempfile.create(['autoload', '.rb']) {|file| file.puts 'sleep 0.5; class AutoloadTest; X = 1; end' file.close @@ -94,7 +94,7 @@ p Foo::Bar def test_threaded_accessing_inner_constant # Suppress "warning: loading in progress, circular require considered harmful" - EnvUtil.suppress_warning { + EnvUtil.default_warning { Tempfile.create(['autoload', '.rb']) {|file| file.puts 'class AutoloadTest; sleep 0.5; X = 1; end' file.close |