From 21538b219e21e9e20b60375dedbe839365526672 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 4 Jun 2013 15:34:55 +0000
Subject: merge revision(s) 39899:

	* test/ruby/test_require.rb: Remove temporally files in the tests.

	* test/ruby/test_rubyoptions.rb: Ditto.

	* test/logger/test_logger.rb: Ditto.

	* test/psych/test_psych.rb: Ditto.

	* test/readline/test_readline.rb: Ditto.

	* test/syslog/test_syslog_logger.rb: Ditto.

	* test/webrick/test_httpauth.rb: Ditto.

	* test/zlib/test_zlib.rb: Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_require.rb     | 6 ++++++
 test/ruby/test_rubyoptions.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'test/ruby')

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index c9326380e6..ff5a519638 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -26,6 +26,7 @@ class TestRequire < Test::Unit::TestCase
         p :ok
       end
     INPUT
+    t.close(true)
   end
 
   def test_require_too_long_filename
@@ -124,6 +125,7 @@ class TestRequire < Test::Unit::TestCase
   ensure
     env_rubypath ? ENV["RUBYPATH"] = env_rubypath : ENV.delete("RUBYPATH")
     env_home ? ENV["HOME"] = env_home : ENV.delete("HOME")
+    t.close(true)
   end
 
   def test_require_with_unc
@@ -281,6 +283,7 @@ class TestRequire < Test::Unit::TestCase
     INPUT
 
     assert_raise(ArgumentError) { at_exit }
+    t.close(true)
   end
 
   def test_load2  # [ruby-core:25039]
@@ -294,6 +297,7 @@ class TestRequire < Test::Unit::TestCase
     assert_in_out_err([], <<-INPUT, %w("hello"), [])
       load(#{ t.path.dump }, true)
     INPUT
+    t.close(true)
   end
 
   def test_tainted_loadpath
@@ -343,6 +347,8 @@ class TestRequire < Test::Unit::TestCase
       require "#{ file }"
       p :ok
     INPUT
+
+    t.close(true)
   end
 
   def test_relative
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 8f22bdaecc..e84002c9c9 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -524,7 +524,7 @@ class TestRubyOptions < Test::Unit::TestCase
     t.flush
     assert_in_out_err(["-e", "$0=ARGV[0]; Process.kill :SEGV, $$", t.path],
                       "", [], expected_stderr, bug7597, opts)
-    t.close
+    t.close(true)
   end
 
   def test_DATA
-- 
cgit v1.2.3