diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:16:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:16:06 +0000 |
| commit | b00a8195119a0e5ca20af8ea1122aa8b18e4ccb5 (patch) | |
| tree | 0d5e25bd4834697e2db75b45f345ad8df5f9e242 /test | |
| parent | 745dcf0915a0de05c1f4b8d167ce7bf8c214dfc2 (diff) | |
merges the latter half of r23699 and r23706 from trunk into ruby_1_9_1.
--
* io.c (argf_skip): should close only when current_file is available.
--
* test/ruby/test_argf.rb (TestArgf#test_skip): updated test
according to clarified behavior.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_argf.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb index 9e18a80b40..a6c224ba41 100644 --- a/test/ruby/test_argf.rb +++ b/test/ruby/test_argf.rb @@ -658,16 +658,12 @@ class TestArgf < Test::Unit::TestCase def test_skip ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f| - begin - ARGF.skip - rescue - puts "cannot skip" # ??? - end + ARGF.skip puts ARGF.gets ARGF.skip puts ARGF.read SRC - assert_equal("cannot skip\n1\n3\n4\n5\n6\n", f.read) + assert_equal("1\n3\n4\n5\n6\n", f.read) end end |