diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 14:51:57 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 14:51:57 +0000 |
| commit | dc3c09cbe0af8887a6e6d3bc5cbf2050f476f55f (patch) | |
| tree | 0bd99eab557c64024446c1727a8d3a9a0cc1fcf3 | |
| parent | 6e22e6b73a5dab9dd94c332ba12454a35004e3c9 (diff) | |
merges r20288 from trunk into ruby_1_9_1.
* lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust
indentation to shut up warning. [ruby-core:19993]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/minitest/unit.rb | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Nov 20 07:27:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust + indentation to shut up warning. [ruby-core:19993] + Wed Nov 19 17:48:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/syck/rubyext.c (rb_syck_mktime): return DateTime for a value diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 460258cdf2..df6394a8eb 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -191,12 +191,12 @@ module MiniTest assert caught, message(msg) { default } end - def capture_io - require 'stringio' + def capture_io + require 'stringio' - orig_stdout, orig_stderr = $stdout, $stderr - captured_stdout, captured_stderr = StringIO.new, StringIO.new - $stdout, $stderr = captured_stdout, captured_stderr + orig_stdout, orig_stderr = $stdout, $stderr + captured_stdout, captured_stderr = StringIO.new, StringIO.new + $stdout, $stderr = captured_stdout, captured_stderr yield |