Revert "check other IO#close calls"
This reverts commit a1c4cab11d613d7df037a81a770ee44a23a2e9be.
This commit is contained in:
parent
049e1f8560
commit
d1424f7f7e
@ -35,20 +35,6 @@ module Test
|
||||
_report "start", Marshal.dump([inst.class.name, inst.__name__])
|
||||
end
|
||||
|
||||
def close_io io, suite
|
||||
# To figure out which suite raises EBADF error.
|
||||
begin
|
||||
io.close if io && !io.closed?
|
||||
rescue Exception => e
|
||||
STDERR.puts <<~EOS
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! #{e} at #{suite.name}
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
EOS
|
||||
raise
|
||||
end
|
||||
end
|
||||
|
||||
def _run_suite(suite, type) # :nodoc:
|
||||
@partial_report = []
|
||||
orig_testout = Test::Unit::Runner.output
|
||||
@ -79,15 +65,13 @@ module Test
|
||||
$stdin = orig_stdin
|
||||
$stdout = orig_stdout
|
||||
|
||||
close_io o, suite
|
||||
|
||||
o.close
|
||||
begin
|
||||
th.join
|
||||
rescue IOError
|
||||
raise unless /stream closed|closed stream/ =~ $!.message
|
||||
end
|
||||
|
||||
close_io i, suite
|
||||
i.close
|
||||
|
||||
result << @partial_report
|
||||
@partial_report = nil
|
||||
@ -101,8 +85,21 @@ module Test
|
||||
Test::Unit::Runner.output = orig_stdout
|
||||
$stdin = orig_stdin if orig_stdin
|
||||
$stdout = orig_stdout if orig_stdout
|
||||
close_io o, suite
|
||||
close_io i, suite
|
||||
|
||||
# To figure out which suite raises EBADF error.
|
||||
begin
|
||||
o.close if o && !o.closed?
|
||||
rescue Exception => e
|
||||
STDERR.puts "#{e} at #{suite.name} (o)"
|
||||
raise
|
||||
end
|
||||
|
||||
begin
|
||||
i.close if i && !i.closed?
|
||||
rescue Exception => e
|
||||
STDERR.puts "#{e} at #{suite.name} (i)"
|
||||
raise
|
||||
end
|
||||
end
|
||||
|
||||
def run(args = []) # :nodoc:
|
||||
|
Loading…
x
Reference in New Issue
Block a user