From b4a002070779beaf267ae86bb9c54ba50e99d633 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 19 Nov 2007 15:57:52 +0000 Subject: * test/fileutils/fileasserts.rb (assert_equal_time): show nsec if assertion fails but time.to_s equals. (assert_same_entry): use assert_equal_time. * test/fileutils/test_fileutils.rb (test_install): use assert_equal_time. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/fileutils/fileasserts.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'test/fileutils/fileasserts.rb') diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb index c2e9244a96..d72d9f3932 100644 --- a/test/fileutils/fileasserts.rb +++ b/test/fileutils/fileasserts.rb @@ -17,7 +17,7 @@ module Test b = File.stat(to) assert_equal a.mode, b.mode, "mode #{a.mode} != #{b.mode}" #assert_equal a.atime, b.atime - assert_equal a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}" + assert_equal_time a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}" assert_equal a.uid, b.uid, "uid #{a.uid} != #{b.uid}" assert_equal a.gid, b.gid, "gid #{a.gid} != #{b.gid}" end @@ -62,6 +62,22 @@ module Test } end + def assert_equal_time(expected, actual, message=nil) + _wrap_assertion { + expected_str = expected.to_s + actual_str = actual.to_s + if expected_str == actual_str + expected_str << " (nsec=#{expected.nsec})" + actual_str << " (nsec=#{actual.nsec})" + end + full_message = build_message(message, < expected but was +. +EOT + assert_block(full_message) { expected == actual } + } + end + end end end -- cgit v1.2.3