diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-11 02:21:48 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-11 02:21:48 +0000 |
commit | 2f75c64448b558c6da12e96e9cecadeb846f8e75 (patch) | |
tree | c1407252307804ea49496332297c4166a799bc56 | |
parent | 8440511363bdda64d6d1384662e5da0c0a9d0f96 (diff) | |
download | ruby-2f75c64448b558c6da12e96e9cecadeb846f8e75.tar.gz |
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.
------------------------------------------------------------------------
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/-ext-/old_thread_select/test_old_thread_select.rb | 6 | ||||
-rw-r--r-- | version.h | 4 |
2 files changed, 5 insertions, 5 deletions
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 1ccdb3414d..b70e1d3862 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_operator diff, :>=, 0.001, "returned too early" end end @@ -84,10 +84,10 @@ class TestOldThreadSelect < Test::Unit::TestCase 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 @@ -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" |