ruby-changes:21405
From: kosaki <ko1@a...>
Date: Tue, 11 Oct 2011 11:22:00 +0900 (JST)
Subject: [ruby-changes:21405] kosaki:r33454 (ruby_1_9_3): merge revision(s) 33203:
kosaki 2011-10-11 11:21:48 +0900 (Tue, 11 Oct 2011) New Revision: 33454 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33454 Log: merge revision(s) 33203: ------------------------------------------------------------------------ r33203 | naruse | 2011-09-06 04:11:21 -0400 (Tue, 06 Sep 2011) | 1 line Use assert_operator to show clear message. ------------------------------------------------------------------------ Modified files: branches/ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 33453) +++ ruby_1_9_3/version.h (revision 33454) @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_DATE "2011-10-11" +#define RUBY_RELEASE_DATE "2011-10-10" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 10 #include "ruby/version.h" 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 33453) +++ ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb (revision 33454) @@ -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_operator diff, :>=, 0.001, "returned too early" end end @@ -84,10 +84,10 @@ end diff = Time.now - t0 - assert diff >= 1.0, "interrupted or short wait" + assert_operator diff, :>=, 1.0, "interrupted or short wait" assert_equal 0, rc assert_equal true, thr.value - assert received, "SIGINT not received" + assert_not_equal false, received, "SIGINT not received" ensure trap(:INT, "DEFAULT") end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/