archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34129:

Browse source 
* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
	  accept the block argument.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ayumin 2012-01-11 16:40:59 +00:00
parent c511d463d8
commit 3b22a82547
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 12 01:40:33 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
accept the block argument.
Sat Jan 7 22:46:36 2012 Kouhei Sutou <kou@cozmixng.org> Sat Jan 7 22:46:36 2012 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/parsers/baseparser.rb: use private instead of _xxx * lib/rexml/parsers/baseparser.rb: use private instead of _xxx

43
test/ruby/test_io.rb
View file

@ -1395,32 +1395,29 @@ class TestIO < Test::Unit::TestCase
feature2250 = '[ruby-core:26222]' feature2250 = '[ruby-core:26222]'
pre = 'ft2250' pre = 'ft2250'
Tempfile.new(pre) do |t| t = Tempfile.new(pre)
f = IO.for_fd(t.fileno) f = IO.for_fd(t.fileno)
assert_equal(true, f.autoclose?) assert_equal(true, f.autoclose?)
f.autoclose = false f.autoclose = false
assert_equal(false, f.autoclose?) assert_equal(false, f.autoclose?)
f.close f.close
assert_nothing_raised(Errno::EBADF) {t.close} assert_nothing_raised(Errno::EBADF) {t.close}
t.open t.open
f = IO.for_fd(t.fileno, autoclose: false) f = IO.for_fd(t.fileno, autoclose: false)
assert_equal(false, f.autoclose?) assert_equal(false, f.autoclose?)
f.autoclose = true f.autoclose = true
assert_equal(true, f.autoclose?) assert_equal(true, f.autoclose?)
f.close f.close
assert_raise(Errno::EBADF) {t.close} assert_raise(Errno::EBADF) {t.close}
end
Tempfile.new(pre) do |t| t = Tempfile.new(pre)
try_fdopen(t.fileno) try_fdopen(t.fileno)
assert_raise(Errno::EBADF) {t.close} assert_raise(Errno::EBADF) {t.close}
end
Tempfile.new(pre) do |t| t = Tempfile.new(pre)
try_fdopen(f.fileno, false) try_fdopen(t.fileno, false)
assert_nothing_raised(Errno::EBADF) {t.close} assert_nothing_raised(Errno::EBADF) {t.close}
end
end end
def test_open_redirect def test_open_redirect

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 21 #define RUBY_PATCHLEVEL 22
#define RUBY_RELEASE_DATE "2012-01-10" #define RUBY_RELEASE_DATE "2012-01-12"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 10 #define RUBY_RELEASE_DAY 12
#include "ruby/version.h" #include "ruby/version.h"