naruse	2012-02-08 09:48:02 +0900 (Wed, 08 Feb 2012)

  New Revision: 34468

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

  Log:
    merge revision(s) 33762:
    
    * test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
      small for busy environment.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_sleep.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34467)
+++ ruby_1_9_3/ChangeLog	(revision 34468)
@@ -1,3 +1,8 @@
+Wed Feb  8 09:47:52 2012  Tanaka Akira  <akr@f...>
+
+	* test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
+	  small for busy environment.
+
 Wed Feb  8 09:45:23 2012  Tanaka Akira  <akr@f...>
 
 	* test/dbm/test_dbm.rb: split tests for read only database.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34467)
+++ ruby_1_9_3/version.h	(revision 34468)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 53
+#define RUBY_PATCHLEVEL 54
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_sleep.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_sleep.rb	(revision 34467)
+++ ruby_1_9_3/test/ruby/test_sleep.rb	(revision 34468)
@@ -6,7 +6,8 @@
     start = Time.now
     sleep 5
     slept = Time.now-start
-    assert_in_delta(5.0, slept, 0.1, "[ruby-core:18015]: longer than expected")
+    assert_operator(5.0, :<=, slept)
+    assert_operator(slept, :<=, 6.0, "[ruby-core:18015]: longer than expected")
   ensure
     GC.enable
   end

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