From fe38158f9bfe14b7e4b28f5e3e05f371dee429d8 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Jun 2014 22:31:30 +0000
Subject: * 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
---
 test/ruby/envutil.rb       | 8 ++++++++
 test/ruby/test_autoload.rb | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'test/ruby')

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
-- 
cgit v1.2.3