[前][次][番号順一覧][スレッド一覧]

ruby-changes:35271

From: nobu <ko1@a...>
Date: Tue, 2 Sep 2014 22:33:08 +0900 (JST)
Subject: [ruby-changes:35271] nobu:r47353 (trunk): test_io.rb: ignore stream closed IOError

nobu	2014-09-02 22:32:59 +0900 (Tue, 02 Sep 2014)

  New Revision: 47353

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

  Log:
    test_io.rb: ignore stream closed IOError
    
    * test/ruby/test_io.rb (test_readpartial_locktmp): stream closed
      IOError while reading is not a matter.  [Bug #10193]

  Modified files:
    trunk/test/ruby/test_io.rb
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 47352)
+++ test/ruby/test_io.rb	(revision 47353)
@@ -2867,15 +2867,19 @@ End https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L2867
       Thread.pass until th.stop?
       buf.replace("")
       assert_empty(buf, bug6099)
-      th.join rescue ($@.concat(caller); raise) unless th.alive?
+      assert_predicate(th, :alive?)
       w.write(data)
       Thread.pass while th.alive?
-      th.join rescue ($@.concat(caller); raise)
     end
     assert_equal(data, buf, bug6099)
   rescue RuntimeError # can't modify string; temporarily locked
   ensure
-    th.join if th
+    if th
+      begin
+        th.join
+      rescue IOError
+      end
+    end
   end
 
   def test_advise_pipe

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

[前][次][番号順一覧][スレッド一覧]