Skip to content

Commit

Permalink
use spawn's option to shorten the code
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed Oct 30, 2015
1 parent a666e9b commit 89d0720
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions test/ruby/test_io.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,9 @@ def test_dup
end

def test_dup_many
assert_separately([], <<-'End')
if defined?(Process::RLIMIT_NOFILE)
lim = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
Process.setrlimit(Process::RLIMIT_NOFILE, [lim, 1024].min)
end
opts = {}
opts[:rlimit_nofile] = 1024 if defined?(Process::RLIMIT_NOFILE)
assert_separately([], <<-'End', opts)
a = []
assert_raise(Errno::EMFILE, Errno::ENFILE, Errno::ENOMEM) do
loop {a << IO.pipe}
Expand Down Expand Up @@ -3066,25 +3064,17 @@ def test_io_select_with_many_files
assert_normal_exit %q{
require "tempfile"
# try to raise RLIM_NOFILE to >FD_SETSIZE
# Unfortunately, ruby export FD_SETSIZE. then we assume it's 1024.
# Unfortunately, ruby doesn't export FD_SETSIZE. then we assume it's 1024.
fd_setsize = 1024
begin
Process.setrlimit(Process::RLIMIT_NOFILE, fd_setsize+10)
rescue =>e
# Process::RLIMIT_NOFILE couldn't be raised. skip the test
exit 0
end
tempfiles = []
(0..fd_setsize+1).map {|i|
tempfiles << Tempfile.open("test_io_select_with_many_files")
}
IO.select(tempfiles)
}, bug8080, timeout: 30
end
}, bug8080, timeout: 30, rlimit_nofile: 1024+10
end if defined?(Process::RLIMIT_NOFILE)

def test_read_32bit_boundary
bug8431 = '[ruby-core:55098] [Bug #8431]'
Expand Down

0 comments on commit 89d0720

Please sign in to comment.