summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_thread.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db8d94bf29..39f066f188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 16 06:34:30 2011 Tanaka Akira <akr@fsij.org>
+
+ * test/ruby/test_thread.rb (test_condvar_timed_wait): use
+ assert_operator.
+
Tue Nov 15 21:56:25 2011 Tanaka Akira <akr@fsij.org>
* test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 57e02849b9..0cd20ba1e5 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -186,7 +186,8 @@ class TestThread < Test::Unit::TestCase
t1 = Time.now
t = t1-t0
- assert_block { timeout*0.9 < t && t < timeout*1.1 }
+ assert_operator(timeout*0.9, :<, t)
+ assert_operator(t, :<, timeout*1.1)
assert(locked)
end