aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 17:14:27 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 17:14:27 +0000
commita1d837ccc1ff4b41f385fe0a167ae67cee1bcdd8 (patch)
treeaf703d233beae43f1816ad07d3e4a67557927e26 /test
parent8f9b451dd8260417fa57f88c6df09e41535d3c2b (diff)
downloadruby-a1d837ccc1ff4b41f385fe0a167ae67cee1bcdd8.tar.gz
* 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
Diffstat (limited to 'test')
-rw-r--r--test/ruby/envutil.rb2
1 files changed, 2 insertions, 0 deletions
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)