1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assert_in_out_err should use FailDesc too

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-09-27 21:07:53 +09:00
parent 8d0ff88727
commit 03284fb911
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tool/lib/test/unit/core_assertions.rb
View File

@ -52,15 +52,13 @@ module Test
args = Array(args).dup args = Array(args).dup
args.insert((Hash === args[0] ? 1 : 0), '--disable=gems') args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt) stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
if signo = status.termsig desc = FailDesc[status, message, stderr]
EnvUtil.diagnostic_reports(Signal.signame(signo), status.pid, Time.now)
end
if block_given? if block_given?
raise "test_stdout ignored, use block only or without block" if test_stdout != [] raise "test_stdout ignored, use block only or without block" if test_stdout != []
raise "test_stderr ignored, use block only or without block" if test_stderr != [] raise "test_stderr ignored, use block only or without block" if test_stderr != []
yield(stdout.lines.map {|l| l.chomp }, stderr.lines.map {|l| l.chomp }, status) yield(stdout.lines.map {|l| l.chomp }, stderr.lines.map {|l| l.chomp }, status)
else else
all_assertions(message) do |a| all_assertions(desc) do |a|
[["stdout", test_stdout, stdout], ["stderr", test_stderr, stderr]].each do |key, exp, act| [["stdout", test_stdout, stdout], ["stderr", test_stderr, stderr]].each do |key, exp, act|
a.for(key) do a.for(key) do
if exp.is_a?(Regexp) if exp.is_a?(Regexp)