From a1d837ccc1ff4b41f385fe0a167ae67cee1bcdd8 Mon Sep 17 00:00:00 2001 From: kazu Date: Fri, 30 Nov 2012 17:14:27 +0000 Subject: * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): raise if assert_in_out_err misused. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/envutil.rb | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index d2289222e2..e095e4b990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 1 02:04:23 2012 Kazuhiro NISHIYAMA + + * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): + raise if assert_in_out_err misused. + Sat Dec 1 02:08:16 2012 NAKAMURA Usaku * test/rdoc/test_rdoc_rubygems_hook.rb diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 73fde74881..9e527e90b1 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -166,6 +166,8 @@ module Test def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={}) stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, opt) if block_given? + 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 != [] yield(stdout.lines.map {|l| l.chomp }, stderr.lines.map {|l| l.chomp }) else if test_stdout.is_a?(Regexp) -- cgit v1.2.3