kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

assert_separately uses their own pipe instead of stdout

Browse source
This commit is contained in:
NARUSE, Yui 2020-02-04 19:29:27 +09:00
parent 7d6903dc47
commit 0529fead36
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tool/lib/test/unit/core_assertions.rb
View file

@ -110,11 +110,13 @@ module Test
file ||= loc.path file ||= loc.path
line ||= loc.lineno line ||= loc.lineno
end end
res_p, res_c = IO.pipe
opt[res_c.fileno] = res_c.fileno
src = <<eom src = <<eom
# -*- coding: #{line += __LINE__; src.encoding}; -*- # -*- coding: #{line += __LINE__; src.encoding}; -*-
require "test/unit";include Test::Unit::Assertions;require #{(__dir__ + "/core_assertions").dump};include Test::Unit::CoreAssertions require "test/unit";out=IO.new(#{res_c.fileno});include Test::Unit::Assertions;require #{(__dir__ + "/core_assertions").dump};include Test::Unit::CoreAssertions
END { END {
puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" out.puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}"
} }
#{line -= __LINE__; src} #{line -= __LINE__; src}
class Test::Unit::Runner class Test::Unit::Runner
@ -128,7 +130,10 @@ eom
assert(!abort, FailDesc[status, nil, stderr]) assert(!abort, FailDesc[status, nil, stderr])
self._assertions += stdout[/^assertions=(\d+)/, 1].to_i self._assertions += stdout[/^assertions=(\d+)/, 1].to_i
begin begin
res = Marshal.load(stdout.unpack("m")[0]) res_c.close
puts stdout
STDERR.puts stderr
res = Marshal.load(res_p.read.unpack("m")[0])
rescue => marshal_error rescue => marshal_error
ignore_stderr = nil ignore_stderr = nil
end end