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

* test/ruby/test_io.rb (safe_4): does not use Timeout because

Browse source 
Timeout.timeout uses Thread#kill which raises SecurityError when
  $SAFE == 4.  based on a patch from Tomoyuki Chikanaga.
  [ruby-dev:41484]

* test/ruby/test_io.rb (test_print_separators): use pipe (test helper
  method) instead of IO.pipe.  [ruby-dev:41484]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-06-15 15:08:29 +00:00
parent 6e10636d32
commit 29b22ba2c6
2 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/ruby/test_io.rb
View file

@ -740,12 +740,14 @@ class TestIO < Test::Unit::TestCase
end
def safe_4
Thread.new do
Timeout.timeout(10) do
$SAFE = 4
yield
end
end.join
t = Thread.new do
$SAFE = 4
yield
end
unless t.join(10)
t.kill
flunk("timeout in safe_4")
end
end
def pipe(wp, rp)
@ -1461,15 +1463,16 @@ End
def test_print_separators
$, = ':'
$\ = "\n"
r, w = IO.pipe
w.print('a')
w.print('a','b','c')
w.close
assert_equal("a\n", r.gets)
assert_equal("a:b:c\n", r.gets)
assert_nil r.gets
r.close
pipe(proc do |w|
w.print('a')
w.print('a','b','c')
w.close
end, proc do |r|
assert_equal("a\n", r.gets)
assert_equal("a:b:c\n", r.gets)
assert_nil r.gets
r.close
end)
ensure
$, = nil
$\ = nil