kosaki	2011-08-31 05:28:31 +0900 (Wed, 31 Aug 2011)

  New Revision: 33136

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

  Log:
    merge revision(s) 33131:
    
    * test/-ext-/old_thread_select/test_old_thread_select.rb
      (TestOldThreadSelect#test_old_select_read_timeout): if the machine
      is fast enough, the time used by code around IO.select may be smaller
      than Time implement threshold.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33135)
+++ ruby_1_9_3/ChangeLog	(revision 33136)
@@ -1,3 +1,10 @@
+Wed Aug 31 05:28:26 2011  NAKAMURA Usaku  <usa@r...>
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb
+	  (TestOldThreadSelect#test_old_select_read_timeout): if the machine
+	  is fast enough, the time used by code around IO.select may be smaller
+	  than Time implement threshold.
+
 Wed Aug 31 05:27:59 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
Index: ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb
===================================================================
--- ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 33135)
+++ ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 33136)
@@ -19,7 +19,7 @@
       rc = IO.old_thread_select([r.fileno], nil, nil, 0.001)
       diff = Time.now - t0
       assert_equal 0, rc
-      assert diff > 0.001, "returned too early"
+      assert diff >= 0.001, "returned too early"
     end
   end
 

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