* test/lib/minitest/unit.rb: Use Tempfile#close! instead of

  Tempfile#unlink to close file descriptors.

* test/openssl/test_config.rb: Ditto.

* test/ruby/test_io.rb: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 6 deletions

diff --git a/test/lib/minitest/unit.rb b/test/lib/minitest/unit.rb
index 5847da7d8c..bc6bf48ebf 100644
--- a/test/lib/minitest/unit.rb
+++ b/test/lib/minitest/unit.rb
@@ -1063,7 +1063,7 @@ module MiniTest
         list.each {|str|
           puts "Leaked tempfile: #{name}: #{str}"
         }
-        tempfile_retained.each {|t| t.unlink }
+        tempfile_retained.each {|t| t.close! }
       end
       live2
     end
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
index 1cd3cb6391..4ad90c43f5 100644
--- a/test/openssl/test_config.rb
+++ b/test/openssl/test_config.rb
@@ -17,7 +17,7 @@ __EOD__
   end
 
   def teardown
-    @tmpfile.unlink
+    @tmpfile.close!
   end
 
   def test_constants
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 170b08d310..b104086d43 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1924,7 +1924,7 @@ class TestIO < Test::Unit::TestCase
       assert_raise(Errno::EBADF, feature2250) {t.close}
     end
   ensure
-    t.unlink
+    t.close!
   end
 
   def test_autoclose_false_closed_by_finalizer
@@ -1940,7 +1940,7 @@ class TestIO < Test::Unit::TestCase
       assert_nothing_raised(Errno::EBADF, feature2250) {t.close}
     end
   ensure
-    t.unlink
+    t.close!
   end
 
   def test_open_redirect
@@ -2366,7 +2366,7 @@ End
     }
   ensure
     GC.start
-    t.unlink
+    t.close!
   end
 
   def test_flush_in_finalizer2
@@ -2382,7 +2382,7 @@ End
       assert_nothing_raised(TypeError, bug3910) do
         GC.start
       end
-      t.unlink
+      t.close!
     }
   end