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

* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): raise if assert_in_out_err misused.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kazu 2012-11-30 17:14:27 +00:00
parent 8f9b451dd8
commit a1d837ccc1
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 1 02:04:23 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* 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 <usa@ruby-lang.org> Sat Dec 1 02:08:16 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rdoc/test_rdoc_rubygems_hook.rb * test/rdoc/test_rdoc_rubygems_hook.rb

2
test/ruby/envutil.rb
View File

@ -166,6 +166,8 @@ module Test
def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={}) 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) stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, opt)
if block_given? 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 }) yield(stdout.lines.map {|l| l.chomp }, stderr.lines.map {|l| l.chomp })
else else
if test_stdout.is_a?(Regexp) if test_stdout.is_a?(Regexp)