diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 09:37:58 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 09:37:58 +0000 |
commit | cfeb4beeffa9ce81cdc5e338da1f15731d752725 (patch) | |
tree | cf5c1dba467ebe338bb1961521f7620ef11232ee /test | |
parent | 921a37a7c461c35c3336c61a3c3ddf7941abc6a3 (diff) |
merges r29316 from trunk into ruby_1_9_2.
--
* test/test_prime.rb (TestPrime#test_new): the warning expected have
not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
a.k.a. sora_h. [ruby-dev:42272]
Recovers $stderr even if StringIO.new fails. Reported by unak.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/test_prime.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/test_prime.rb b/test/test_prime.rb index e095a29722..3dd1b89b2f 100644 --- a/test/test_prime.rb +++ b/test/test_prime.rb @@ -55,12 +55,13 @@ class TestPrime < Test::Unit::TestCase end def test_new - buf = StringIO.new('', 'w') - orig, $stderr = $stderr, buf + orig_stderr, orig_verbose = $stderr, $VERBOSE + + $stderr = buf = StringIO.new('', 'w') + $VERBOSE = false enum = Prime.new - assert !buf.string.empty? - $stderr = orig + assert_match("obsolete", buf.string) assert enum.respond_to?(:each) assert enum.kind_of?(Enumerable) @@ -68,7 +69,8 @@ class TestPrime < Test::Unit::TestCase assert Prime === enum ensure - $stderr = orig + $stderr = orig_stderr + $VERBOSE = orig_verbose end def test_enumerator_succ |