From 1474dd064b28e4a813a79342c5523cede60f83c7 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 13 Jun 2013 05:41:44 +0000
Subject: * test/-ext-/test_printf.rb, test/rss/test_parser.rb,  
 test/ruby/test_array.rb, test/ruby/test_hash.rb,   test/ruby/test_m17n.rb,
 test/ruby/test_marshal.rb,   test/ruby/test_object.rb,
 test/ruby/test_string.rb: don't use   untrusted?, untrust, and trust to avoid
 warnings in case $VERBOSE is   true.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_object.rb | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'test/ruby/test_object.rb')

diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index 7b660ce87c..b46403ad6f 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -652,29 +652,33 @@ class TestObject < Test::Unit::TestCase
   end
 
   def test_untrusted
-    obj = Object.new
-    assert_equal(false, obj.untrusted?)
-    assert_equal(false, obj.tainted?)
-    obj.untrust
-    assert_equal(true, obj.untrusted?)
-    assert_equal(true, obj.tainted?)
-    obj.trust
-    assert_equal(false, obj.untrusted?)
-    assert_equal(false, obj.tainted?)
-    obj.taint
-    assert_equal(true, obj.untrusted?)
-    assert_equal(true, obj.tainted?)
-    obj.untaint
-    assert_equal(false, obj.untrusted?)
-    assert_equal(false, obj.tainted?)
+    verbose = $VERBOSE
+    $VERBOSE = false
+    begin
+      obj = Object.new
+      assert_equal(false, obj.untrusted?)
+      assert_equal(false, obj.tainted?)
+      obj.untrust
+      assert_equal(true, obj.untrusted?)
+      assert_equal(true, obj.tainted?)
+      obj.trust
+      assert_equal(false, obj.untrusted?)
+      assert_equal(false, obj.tainted?)
+      obj.taint
+      assert_equal(true, obj.untrusted?)
+      assert_equal(true, obj.tainted?)
+      obj.untaint
+      assert_equal(false, obj.untrusted?)
+      assert_equal(false, obj.tainted?)
+    ensure
+      $VERBOSE = verbose
+    end
   end
 
   def test_to_s
     x = Object.new
     x.taint
-    x.untrust
     s = x.to_s
-    assert_equal(true, s.untrusted?)
     assert_equal(true, s.tainted?)
 
     x = eval(<<-EOS)
-- 
cgit v1.2.3