aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/test_prime.rb12
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d90d244035..63f3cc1951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 22 16:59:40 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * 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.
+
Wed Sep 22 01:55:48 2010 Koichi Sasada <ko1@atdot.net>
* bootstraptest/test_method.rb: fix last commit.
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