summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-06 00:22:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-06 00:22:58 +0000
commit803c3929b8e2d77ba4c7f5678eef563d5aa77c09 (patch)
treebefb94c589556b35e900fc84aac1b13007f566cf /test
parent6d757c79d95b12082d251dddd57d8ea481ae2487 (diff)
test_sleep.rb: get rid of failure on Windows
* test/ruby/test_sleep.rb (test_sleep_5sec): relax bottom on Windows. assert_operator should test on the receiver. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_sleep.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb
index 304a821d984..fdf08aafa1b 100644
--- a/test/ruby/test_sleep.rb
+++ b/test/ruby/test_sleep.rb
@@ -6,8 +6,15 @@ class TestSleep < Test::Unit::TestCase
start = Time.now
sleep 5
slept = Time.now-start
- bottom = /linux/ =~ RUBY_PLATFORM && /Linux ([\d.]+)/ =~ `uname -sr` && ($1.split('.')<=>%w/2 6 18/)<1 ? 4.98 : 5.0
- assert_operator(bottom, :<=, slept)
+ bottom =
+ case RUBY_PLATFORM
+ when /linux/
+ 4.98 if /Linux ([\d.]+)/ =~ `uname -sr` && ($1.split('.')<=>%w/2 6 18/)<1
+ when /mswin|mingw/
+ 4.98
+ end
+ bottom ||= 5.0
+ assert_operator(slept, :>=, bottom)
assert_operator(slept, :<=, 6.0, "[ruby-core:18015]: longer than expected")
ensure
GC.enable