From c45ad62966891edb6180f7b0ed068f12c96642f0 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Aug 2011 20:28:31 +0000
Subject: [PATCH] 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                                              | 7 +++++++
 test/-ext-/old_thread_select/test_old_thread_select.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7cbdb5490c..4f35e6b0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Aug 31 05:28:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
diff --git a/test/-ext-/old_thread_select/test_old_thread_select.rb b/test/-ext-/old_thread_select/test_old_thread_select.rb
index d965724c83..a7db7bdf99 100644
--- a/test/-ext-/old_thread_select/test_old_thread_select.rb
+++ b/test/-ext-/old_thread_select/test_old_thread_select.rb
@@ -19,7 +19,7 @@ class TestOldThreadSelect < Test::Unit::TestCase
       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