yugui	2010-11-24 18:37:58 +0900 (Wed, 24 Nov 2010)

  New Revision: 29920

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29920

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/test_prime.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29919)
+++ ruby_1_9_2/ChangeLog	(revision 29920)
@@ -1,3 +1,10 @@
+Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* 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@a...>
 
 	* bootstraptest/test_method.rb: fix last commit.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29919)
+++ ruby_1_9_2/version.h	(revision 29920)
@@ -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
Index: ruby_1_9_2/test/test_prime.rb
===================================================================
--- ruby_1_9_2/test/test_prime.rb	(revision 29919)
+++ ruby_1_9_2/test/test_prime.rb	(revision 29920)
@@ -55,12 +55,13 @@
   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 @@
 
     assert Prime === enum
   ensure
-    $stderr = orig
+    $stderr = orig_stderr
+    $VERBOSE = orig_verbose
   end
 
   def test_enumerator_succ

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/