diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:26 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:26 +0000 |
| commit | 10e0ed7bd48b3c2dda09f5db05cd5b5fd1618b28 (patch) | |
| tree | 5cc905efc64d2e5dc7b6c655b04c67c17c6e6f70 /test/cgi | |
| parent | e5cd87a6c38d2fc5bcafabba472f37060087bd76 (diff) | |
merges r21101 from trunk into ruby_1_9_1.
* test/rdoc/test_rdoc_info_formatting.rb (setup, teadown): uses
mktmpdir and removes it alfter the test.
* test/cgi/test_cgi_session.rb (setup, teadown): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/cgi')
| -rw-r--r-- | test/cgi/test_cgi_session.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb index 4fcb936d4..6cccb2224 100644 --- a/test/cgi/test_cgi_session.rb +++ b/test/cgi/test_cgi_session.rb @@ -7,14 +7,14 @@ require 'tmpdir' class CGISessionTest < Test::Unit::TestCase def setup - @session_dir = Dir.tmpdir+'/__test_dir__/session_dir/' + @session_dir = File.join(Dir.mktmpdir('__test_dir__'), 'session_dir') FileUtils.mkdir_p @session_dir end def teardown @environ.each do |key, val| ENV.delete(key) end $stdout = STDOUT - FileUtils.rm_rf(@session_dir) + FileUtils.rm_rf(File.dirname(@session_dir)) end def test_cgi_session_filestore |