summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-21 17:15:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-21 17:15:55 +0000
commit10957cd1cc65dfa5c0c8d1f5d96caa8ac787467c (patch)
treeafcb80d1a310e75682cc53c4ab06b5f61b85f7ba /test
parent4a670c2bb6adbb34cb7e244fe1ef2cc888449e6f (diff)
merge revision(s) 49660:
test_file.rb: just skip assertion * test/ruby/test_file.rb (TestFile#test_stat): skip an assertion only, not making the entire test skipped git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_file.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 16b76b71fe..601d19efcd 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -334,8 +334,10 @@ class TestFile < Test::Unit::TestCase
if stat.birthtime != stat.ctime
assert_in_delta t0+4, stat.ctime.to_f, delta
end
- skip "Windows delays updating atime" if /mswin|mingw/ =~ RUBY_PLATFORM
- assert_in_delta t0+6, stat.atime.to_f, delta
+ unless /mswin|mingw/ =~ RUBY_PLATFORM
+ # Windows delays updating atime
+ assert_in_delta t0+6, stat.atime.to_f, delta
+ end
}
rescue NotImplementedError
end