From 8f671120f1d99b47f28d67183855d634d006389a Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 20 Apr 2013 23:03:52 +0000
Subject: * test/csv/test_features.rb, test/logger/test_logger.rb  
 test/mkmf/test_have_macro.rb, test/net/http/test_http.rb,  
 test/openssl/test_config.rb, test/psych/test_encoding.rb,  
 test/psych/test_exception.rb, test/psych/test_psych.rb,  
 test/psych/test_tainted.rb, test/readline/test_readline.rb,  
 test/rexml/test_contrib.rb, test/ruby/test_autoload.rb,  
 test/ruby/test_beginendblock.rb, test/ruby/test_exception.rb,  
 test/ruby/test_file.rb, test/ruby/test_io.rb,   test/ruby/test_marshal.rb,
 test/ruby/test_process.rb,   test/ruby/test_require.rb,
 test/ruby/test_rubyoptions.rb,   test/syslog/test_syslog_logger.rb,
 test/webrick/test_httpauth.rb,   test/zlib/test_zlib.rb: Use Tempfile.create.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/psych/test_exception.rb | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'test/psych/test_exception.rb')

diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb
index d54c7d4fbb..a9fe5c43d1 100644
--- a/test/psych/test_exception.rb
+++ b/test/psych/test_exception.rb
@@ -56,27 +56,27 @@ module Psych
     end
 
     def test_parse_file_exception
-      t = Tempfile.new(['parsefile', 'yml'])
-      t.binmode
-      t.write '--- `'
-      t.close
-      ex = assert_raises(Psych::SyntaxError) do
-        Psych.parse_file t.path
-      end
-      assert_equal t.path, ex.file
-      t.close(true)
+      Tempfile.create(['parsefile', 'yml']) {|t|
+        t.binmode
+        t.write '--- `'
+        t.close
+        ex = assert_raises(Psych::SyntaxError) do
+          Psych.parse_file t.path
+        end
+        assert_equal t.path, ex.file
+      }
     end
 
     def test_load_file_exception
-      t = Tempfile.new(['loadfile', 'yml'])
-      t.binmode
-      t.write '--- `'
-      t.close
-      ex = assert_raises(Psych::SyntaxError) do
-        Psych.load_file t.path
-      end
-      assert_equal t.path, ex.file
-      t.close(true)
+      Tempfile.create(['loadfile', 'yml']) {|t|
+        t.binmode
+        t.write '--- `'
+        t.close
+        ex = assert_raises(Psych::SyntaxError) do
+          Psych.load_file t.path
+        end
+        assert_equal t.path, ex.file
+      }
     end
 
     def test_psych_parse_takes_file
@@ -128,7 +128,7 @@ module Psych
     end
 
     def test_psych_syntax_error
-      Tempfile.open(['parsefile', 'yml']) do |t|
+      Tempfile.create(['parsefile', 'yml']) do |t|
         t.binmode
         t.write '--- `'
         t.close
@@ -138,7 +138,6 @@ module Psych
         rescue StandardError
           assert true # count assertion
         ensure
-          t.close(true)
           return unless $!
 
           ancestors = $!.class.ancestors.inspect
-- 
cgit v1.2.3