summaryrefslogtreecommitdiff
path: root/test/ruby/test_argf.rb
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-14 02:34:46 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-14 02:34:46 +0000
commitfae9930033c786f61616be8a053368e80f0e60a8 (patch)
tree82978a063e1fde56534bb05db2483bd9908ad0a1 /test/ruby/test_argf.rb
parent00aab585373614bb54f11c89267c1306533b2003 (diff)
* test/ruby/test_argf.rb (test_inplace_rename_impossible): unlink
the renamed temporary file on no_safe_rename platforms. * test/ruby/test_argf.rb (test_readlines_limit_0, test_each_line_limit_0): should close argf because the associated Tempfile object cannot unlink the temporary file when it's gc'ed on some platforms (Windows, etc.) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_argf.rb')
-rw-r--r--test/ruby/test_argf.rb18
1 files changed, 14 insertions, 4 deletions
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 992c37b261b..b8b40ec0779 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -210,6 +210,7 @@ class TestArgf < Test::Unit::TestCase
assert_equal([], e)
assert_equal([], r)
assert_equal("foo.new\nbar.new\nbaz.new\n", File.read(t.path))
+ File.unlink(t.path + ".~~~") rescue nil
else
assert_match(/Can't rename .* to .*: .*. skipping file/, e.first) #'
assert_equal([], r)
@@ -699,8 +700,12 @@ class TestArgf < Test::Unit::TestCase
bug4024 = '[ruby-dev:42538]'
t = make_tempfile
argf = ARGF.class.new(t.path)
- assert_raise(ArgumentError, bug4024) do
- argf.readlines(0)
+ begin
+ assert_raise(ArgumentError, bug4024) do
+ argf.readlines(0)
+ end
+ ensure
+ argf.close
end
end
@@ -708,8 +713,13 @@ class TestArgf < Test::Unit::TestCase
bug4024 = '[ruby-dev:42538]'
t = make_tempfile
argf = ARGF.class.new(t.path)
- assert_raise(ArgumentError, bug4024) do
- argf.each_line(0).next
+ begin
+ assert_raise(ArgumentError, bug4024) do
+ argf.each_line(0).next
+ end
+ ensure
+ argf.close
end
+
end
end