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

3 files changed, 15 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 15d3654f01..3c450d56f7 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
diff --git a/version.h b/version.h
index 3e18200870..2539246dc9 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1